Added eating particles.

I broked the branch. :( So I deleted it and remade it. :)
Added the wisdom of broccoli to the new water and air wander tasks
2026-10-21 06:36:25 -04:00 · 2025-02-03 20:31:41 -05:00 · 2025-02-03 13:40:51 -05:00 · 2025-01-31 20:48:35 +10:00 · 2025-01-31 20:10:17 +10:00 · 2025-01-31 08:28:55 +10:00
219 changed files with 6379 additions and 1156 deletions
@@ -5,7 +5,7 @@ plugins {

 version = "${project.property("mod_version")}+${project.property("mc_version")}"

-val isSnapshot = project.property("snapshot")?.equals("true") ?: false
+val isSnapshot = project.property("snapshot")?.equals("true") == true
 if (isSnapshot) {
    val fixedBranchName = versioning.info.branch.substringAfter("/")
    version = "$version-${fixedBranchName}-${versioning.info.build}"
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
+import net.minecraft.world.entity.monster.Creeper;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Creeper.class)
+public class EntityCreeperMixin extends Mob {
+
+    private EntityCreeperMixin(net.minecraft.world.entity.EntityType<? extends Creeper> entityType, Level world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
+    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
+        final Creeper creeper = (Creeper) (Object) this;
+        // Pokemon Entities
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                creeper,
+                PokemonEntity.class,
+                6.0f,
+                1.0,
+                1.2,
+                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedByCreeper() && ((PokemonEntity)entity).getBeamMode() != 1
+            )
+        );
+
+        // Players with shoulder mounted Pokemon
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                creeper,
+                ServerPlayer.class,
+                6.0f,
+                1.0,
+                1.2,
+                entity -> EntityBehaviour.Companion.hasCreeperFearedShoulderMount((ServerPlayer)entity)
+            )
+        );
+
+    }
+}
+
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import net.minecraft.world.entity.monster.Phantom;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(targets = "net/minecraft/world/entity/monster/Phantom$PhantomSweepAttackGoal")
+public class EntityPhantomMixin {
+    // TODO: Figure out how to access the outer class that wraps SwoopMovementGoal
+    // Need to find the cat mons that are near the phantom
+
+//    @Inject(method = "shouldContinue", at = @At(value = "RETURN"), cancellable = true)
+//    public void cobblemon$shouldContinue(CallbackInfoReturnable<Boolean> ci) {
+////        var goalSelectorField = PhantomEntity.class.getClasses();// PhantomEntity.class.getFields();// .class.getDeclaredField("goalSelector");
+//
+////        goalSelectorField.setAccessible(true);
+////        GoalSelector goalSelector = (GoalSelector) goalSelectorField.get(mobEntity);
+////        final SwoopMovementGoal phantom = (SwoopMovementGoal) (Object) this;
+////        if(ci.getReturnValue() == false) {
+////            var result = this$0.getWorld().getEntitiesByClass(
+////                    PokemonEntity.class,
+////                    this$0.getBoundingBox().expand(16.0),
+////                    entity ->  {
+////                        return ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom();
+////                    }
+////            ).isEmpty();
+////
+////                ci.setReturnValue(result);
+////        }
+//    }
+}
+
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
+import net.minecraft.world.entity.monster.AbstractSkeleton;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(AbstractSkeleton.class)
+public class EntitySkeletonMixin extends Mob {
+
+    private EntitySkeletonMixin(EntityType<? extends Mob> entityType, Level world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
+    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
+        final AbstractSkeleton skeleton = (AbstractSkeleton) (Object) this;
+        // Pokemon Entities
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                skeleton,
+                PokemonEntity.class,
+                6.0f,
+                1.0,
+                1.2,
+                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedBySkeleton() && ((PokemonEntity)entity).getBeamMode() != 1
+            )
+        );
+
+        // Players with shoulder mounted Pokemon
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                skeleton,
+                ServerPlayer.class,
+                6.0f,
+                1.0,
+                1.2,
+                entity -> EntityBehaviour.Companion.hasSkeletonFearedShoulderMount((ServerPlayer)entity)
+            )
+        );
+
+    }
+}
+
@@ -15,6 +15,8 @@ object CobblemonActivities {
    val BATTLING = register(Activity("battling"))
    val ACTION_EFFECT = register(Activity("action_effect"))
    val NPC_CHATTING = register(Activity("npc_chatting"))
+    val POKEMON_SLEEPING_ACTIVITY = register(Activity("pokemon_sleeping"))
+    val POKEMON_GROW_CROP = register(Activity("pokemon_grow_crop"))

    fun register(activity: Activity): Activity {
        activities.add(activity)
@@ -9,27 +9,35 @@
 package com.cobblemon.mod.common

 import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.ai.BrainPreset
 import com.cobblemon.mod.common.api.ai.config.BrainConfig
 import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.data.DataRegistry
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.data.BrainPresetSyncPacket
 import com.cobblemon.mod.common.util.adapters.ActivityAdapter
 import com.cobblemon.mod.common.util.adapters.BrainConfigAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
+import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
+import com.mojang.datafixers.util.Either
+import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.entity.schedule.Activity

-object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
+object CobblemonBrainConfigs : JsonDataRegistry<BrainPreset> {
    override val gson: Gson = GsonBuilder()
        .setPrettyPrinting()
        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
@@ -37,21 +45,27 @@ object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
+        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
        .create()

-    override val typeToken = TypeToken.getParameterized(List::class.java, BrainConfig::class.java) as TypeToken<List<BrainConfig>>
+    override val typeToken = TypeToken.get(BrainPreset::class.java)
    override val resourcePath = "brain_presets"
    override val id: ResourceLocation = cobblemonResource("brain_presets")
    override val type = PackType.SERVER_DATA
    override val observable = SimpleObservable<CobblemonBrainConfigs>()

-    val presets = mutableMapOf<ResourceLocation, List<BrainConfig>>()
+    val presets = mutableMapOf<ResourceLocation, BrainPreset>()

    override fun sync(player: ServerPlayer) {
-        // TODO implement probs ay
+        player.sendPacket(BrainPresetSyncPacket(presets))
    }

-    override fun reload(data: Map<ResourceLocation, List<BrainConfig>>) {
+    override fun reload(data: Map<ResourceLocation, BrainPreset>) {
        presets.clear()
        presets.putAll(data)
    }
@@ -57,6 +57,7 @@ object CobblemonCommands {
        FreezePokemonCommand.register(dispatcher)
        ApplyPlayerTextureCommand.register(dispatcher)
        RunMolangScriptCommand.register(dispatcher)
+        BrainEditCommand.register(dispatcher)

        // Possibly lock down registration if and only if under dev environment or running in an environment
        // with a certain system environment variable set
@@ -16,14 +16,31 @@ import com.mojang.serialization.codecs.PrimitiveCodec
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.Optional
+import java.util.UUID
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity

 object CobblemonMemories {
    val memories = mutableMapOf<String, MemoryModuleType<*>>()

+    /*
+     * When a memory doesn't have a codec provided, it's because it doesn't
+     * get serialized during relogs. This makes sense for things like battles which
+     * do not survive a relog therefore any memory of it should be temporary.
+     */
+
    val BATTLING_POKEMON = register("battling_pokemon", ListCodec(UUIDUtil.CODEC, 0, 31))
    val NPC_BATTLING = register("npc_battling", PrimitiveCodec.BOOL)
    val DIALOGUES = register<List<ActiveDialogue>>("npc_dialogues")
    val ACTIVE_ACTION_EFFECT = register<ActionEffectContext>("active_action_effect")
+    val POKEMON_FLYING = register("pokemon_flying", PrimitiveCodec.BOOL)
+    val POKEMON_DROWSY = register("pokemon_drowsy", PrimitiveCodec.BOOL)
+    val POKEMON_SLEEPING = register("pokemon_sleeping", PrimitiveCodec.BOOL)
+    val POKEMON_BATTLE = register<UUID>("pokemon_battle")
+    val REST_PATH_COOLDOWN = register("rest_path_cooldown", PrimitiveCodec.BOOL)
+    val TARGETED_BATTLE_POKEMON = register<UUID>("targeted_battle_pokemon")
+    val NEAREST_VISIBLE_ATTACKER = register<LivingEntity>("nearest_visible_attacker")
+    val NEARBY_GROWABLE_CROPS = register<BlockPos>("nearby_growable_crops")

    fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
        val memoryModule = MemoryModuleType(Optional.of(codec))
@@ -36,4 +53,4 @@ object CobblemonMemories {
        memories[id] = memoryModule
        return memoryModule
    }
-}
+}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common

 import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPosableAnimationHandler
@@ -51,8 +52,16 @@ import com.cobblemon.mod.common.client.net.storage.pc.OpenPCHandler
 import com.cobblemon.mod.common.client.net.storage.pc.SetPCBoxPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.pc.SetPCPokemonHandler
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.*
+import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
+import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
+import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
@@ -93,14 +102,38 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.*
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.*
+import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
-import com.cobblemon.mod.common.net.messages.server.*
-import com.cobblemon.mod.common.net.messages.server.battle.*
+import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
+import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
+import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
+import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
+import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
+import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
+import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
+import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
+import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
@@ -130,9 +163,22 @@ import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonT
 import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.UnlinkPlayerFromPCPacket
-import com.cobblemon.mod.common.net.messages.server.trade.*
-import com.cobblemon.mod.common.net.serverhandling.*
-import com.cobblemon.mod.common.net.serverhandling.battle.*
+import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
+import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
+import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
+import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
+import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
+import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
+import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
@@ -166,7 +212,12 @@ import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePartyPokemonTo
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.ReleasePartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.SwapPCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.UnlinkPlayerFromPCHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.*
+import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer

@@ -304,6 +355,7 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(BrainPresetSyncPacket.ID, BrainPresetSyncPacket::decode, DataRegistrySyncPacketHandler()))

        // Effects
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -354,6 +406,9 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
        list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))

+        // Behaviours
+        list.add(PacketRegisterInfo(OpenBehaviourEditorPacket.ID, OpenBehaviourEditorPacket::decode, OpenBehaviourEditorHandler))
+
        // Pokédex scanning
        list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
        return list
@@ -443,6 +498,9 @@ object CobblemonNetwork {
        // NPC packets
        list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))

+        // Behaviour Packets
+        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
+
        return list
    }

@@ -8,6 +8,12 @@

 package com.cobblemon.mod.common

+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.ItemEntitySensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
+import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
 import java.util.function.Supplier
@@ -20,10 +26,22 @@ object CobblemonSensors {

    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
    val BATTLING_POKEMON = register("battling_pokemon", ::BattlingPokemonSensor)
+//    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
+    val POKEMON_DROWSY = register("pokemon_drowsy", ::DrowsySensor)
+
+    val POKEMON_ADULT = register("pokemon_adult_sensor", ::PokemonAdultSensor)
+
+    val POKEMON_DISTURBANCE = register("pokemon_disturbance_sensor", ::PokemonDisturbancesSensor)
+
+    val POKEMON_DEFEND_OWNER = register("pokemon_owner_under_attack", ::DefendOwnerSensor)
+
+    val NEARBY_GROWABLE_CROPS = register("nearby_growable_crops", ::PokemonGrowableCropSensor)
+
+    val ITEM_SENSOR = register("item_sensor", ::ItemEntitySensor)

    fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
        val sensor = SensorType(supplier)
        sensors[id] = sensor
        return sensor
    }
-}
+}
@@ -9,11 +9,14 @@
 package com.cobblemon.mod.common.api.ai

 import com.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule

 class BrainConfigurationContext {
+    var appliedBrainPresets: MutableSet<ResourceLocation> = mutableSetOf()

    var defaultActivity = Activity.IDLE
    var coreActivities = setOf(Activity.CORE)
@@ -27,6 +30,11 @@ class BrainConfigurationContext {
    fun apply(entity: LivingEntity, brainConfigs: List<BrainConfig>) {
        val brain = entity.brain

+        if (entity is MoLangScriptingEntity) {
+            entity.registerVariables(brainConfigs.flatMap { it.getVariables(entity) })
+            entity.initializeScripting()
+        }
+
        // Setup the brain config
        brainConfigs.forEach { it.configure(entity, this) }

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.entityTypeRegistry
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+class BrainPreset(
+    val name: Component = "dummy".asTranslated(),
+    val description: Component = "".asTranslated(),
+    val entityType: ResourceLocation? = null,
+    val configurations: List<BrainConfig> = mutableListOf()
+) {
+    fun canBeApplied(entity: LivingEntity) = entityType?.let { entity.type == entity.level().entityTypeRegistry.get(it) } != false
+}
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.mojang.datafixers.util.Either
+import kotlin.jvm.optionals.getOrNull
+
+typealias ExpressionOrEntityVariable = Either<Expression, MoLangConfigVariable>
+
+fun List<ExpressionOrEntityVariable>.asVariables() = mapNotNull { it.right().getOrNull() }
+
+
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+/**
+ * The medium that an entity might be in which motivates what type of wandering it should do.
+ *
+ * If you've discovered this in main and it's not being used outside of that unused extension function, delete me
+ *
+ * @author Hiroku
+ * @since January 25th, 2025
+ */
+enum class PathfindingMedium {
+    LAND,
+    WATER,
+    LAVA,
+    AIR
+}
@@ -8,27 +8,23 @@

 package com.cobblemon.mod.common.api.ai.config

-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class AddTasksToActivity : BrainConfig {
    val activity = Activity.IDLE
-    val condition = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasksByPriority = mutableMapOf<Int, List<TaskConfig>>()
+    override fun getVariables(entity: LivingEntity) = tasksByPriority.values.flatten().flatMap { it.getVariables(entity) } + listOf(condition).asVariables()

    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
+        if (!checkCondition(entity, condition)) return

        val activity = brainConfigurationContext.getOrCreateActivity(activity)
        tasksByPriority.forEach { (priority, taskConfigs) ->
@@ -9,8 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import net.minecraft.world.entity.LivingEntity

-object DummyBrainConfig : BrainConfig {
+class AddVariablesConfig : BrainConfig {
+    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()
+
+    // Configuration happens naturally through the override on variables
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
 }
@@ -8,28 +8,42 @@

 package com.cobblemon.mod.common.api.ai.config

-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonBrainConfigs
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity

 class ApplyPresets : BrainConfig {
-    val condition = "true".asExpressionLike()
+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val presets = mutableListOf<ResourceLocation>()
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return if (checkCondition(entity, condition)) {
+            presets.flatMap {
+                CobblemonBrainConfigs.presets[it]?.configurations?.flatMap { it.getVariables(entity) } ?: emptyList()
+            } + listOf(condition).asVariables()
+        } else {
+            listOf(condition).asVariables()
+        }
+    }

-        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it] ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
-        presetConfigs.forEach { it.configure(entity, brainConfigurationContext) }
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+
+        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it]?.takeIf { it.canBeApplied(entity) }?.configurations ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
+        // Why not just add the presets to the context directly?
+        // Nested preset application is a thing, and I only want to track the top level presets.
+        // i.e. if a preset applies another preset, I don't want to track the inner preset, since it's redundant if we track the top one.
+        val originalContextPresets = brainConfigurationContext.appliedBrainPresets.toMutableSet()
+        presetConfigs.forEach {
+            it.configure(entity, brainConfigurationContext)
+        }
+        originalContextPresets.addAll(presets)
+        brainConfigurationContext.appliedBrainPresets = originalContextPresets
    }
 }
@@ -8,7 +8,15 @@

 package com.cobblemon.mod.common.api.ai.config

+import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity

 /**
@@ -30,12 +38,21 @@ interface BrainConfig {
            "add_tasks_to_activity" to AddTasksToActivity::class.java,
            "apply_presets" to ApplyPresets::class.java,
            "set_default_activity" to SetDefaultActivity::class.java,
-            "set_core_activities" to SetCoreActivities::class.java
+            "set_core_activities" to SetCoreActivities::class.java,
+            "add_variables" to AddVariablesConfig::class.java,
+            "set_variables" to SetVariablesConfig::class.java,
        )

    }

+    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
+        val runtime = MoLangRuntime().setup()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        return runtime.resolveBoolean(expressionOrEntityVariable.map({ it }, { "q.entity.config.${it.variableName}".asExpression() }))
+    }
+
 //    fun encode(buffer: RegistryFriendlyByteBuf)
 //    fun decode(buffer: RegistryFriendlyByteBuf)
+    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
    fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext)
 }
@@ -117,3 +117,49 @@ Example brain preset (`uses_healing_machine.json`):
  }
 ]
 ```
+
+### add_variables
+The `add_variables` type adds some number of MoLang variables to the entity that can be configured in-game or left with defaults.
+- `variables`: A list of objects, each representing a variable that can be configured.
+
+Each variable has the following properties:
+- `variableName`: The name of the variable. This is the name that will be accessible from MoLang scripts.
+- `defaultValue`: The default value of the variable. This is a MoLang expression that will be used if the variable is not set.
+- `displayName`: The display name of the variable. This is used in the UI to label the variable. This can be a translation key.
+- `description`: A description of the variable. This is used in the UI to describe what the variable does. This can be a translation key.
+- `type`: The type of the variable. This can be `TEXT`, `NUMBER`, or `BOOLEAN`.
+
+Example:
+```json
+{
+  "type": "add_variables",
+  "variables": [
+    {
+      "variableName": "can_heal_using_machine",
+      "defaultValue": "false",
+      "displayName": "Can Use Healing Machine",
+      "description": "Whether or not the entity can use a healing machine.",
+      "type": "BOOLEAN"
+    }
+  ]
+}
+```
+
+### set_variables
+The `set_variables` type sets some values for pre-established variables. This is useful in cases where a preset has defined a variable
+but it's locked in by a specific entity using that preset. This strongly forces the variable to a specific value. In future this
+probably should deregister the variable so that the client cannot edit them once they've been forced, as currently that will
+be possible yet the value will get repeatedly overwritten.
+
+The values inside the variables map can be MoLang expressions (with `q.entity` as the entity) or simple JSON primitives.
+
+Example:
+```json
+{
+  "type": "set_variables",
+  "variables": {
+    "aggressive": true,
+    "attack_range": "10"
+  }
+}
+```
@@ -15,8 +15,10 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.ActivityConfigurationContext
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.activityRegistry
@@ -33,10 +35,11 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 class ScriptBrainConfig : BrainConfig {
    val condition = "true".asExpressionLike()
    val script = cobblemonResource("dummy")
+    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()

    override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return

        val struct = createBrainStruct(entity, context)
@@ -50,7 +53,7 @@ class ScriptBrainConfig : BrainConfig {

    fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
        return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()) }
+            .addFunction("entity") { entity.asMostSpecificMoLangValue() }
            .addFunction("create_activity") { params ->
                val name = params.getString(0).asIdentifierDefaultingNamespace()
                val activity = entity.level().activityRegistry.get(name) ?: return@addFunction run {
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class SetCoreActivities : BrainConfig {
    val activities = mutableListOf<Activity>()
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
        brainConfigurationContext.coreActivities = activities.toSet()
    }
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class SetDefaultActivity : BrainConfig {
    val activity: Activity = Activity.IDLE
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
        brainConfigurationContext.defaultActivity = activity
    }
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+
+class SetVariablesConfig : BrainConfig {
+    var variableValues = mutableMapOf<String, ExpressionLike>()
+
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
+        val runtime = MoLangRuntime().setup()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (entity is MoLangScriptingEntity) {
+            variableValues.forEach { (variableName, valueExpression) ->
+                entity.config.setDirectly(variableName, runtime.resolve(valueExpression))
+            }
+        }
+    }
+}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.ai.util.HoverRandomPos
+
+class AirWanderTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(WANDER, "air_wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "air_wander_chance", 1/(20 * 1F)).asExpressible()
+    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 20).asExpressible()
+    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    val minUpwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+    val minDownwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(condition, wanderChance, horizontalRange, verticalRange, speedMultiplier, minUpwardsMovement, minDownwardsMovement).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.registered(MemoryModuleType.LOOK_TARGET)
+            ).apply(it) { walkTarget, lookTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || entity.isInWater) {
+                        return@Trigger false
+                    }
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                    val wanderChance = wanderChance.resolveFloat()
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
+
+                    val rotVec = entity.getViewVector(0F)
+                    val target = HoverRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), rotVec.x, rotVec.y, 1.5707964f, minUpwardsMovement.resolveInt(), minDownwardsMovement.resolveInt())
+                        ?: return@Trigger false
+                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 3))
+                    lookTarget.set(BlockPosTracker(target))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
@@ -8,25 +8,36 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class AllOfTaskConfig : TaskConfig {
-    val condition = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasks: List<TaskConfig> = emptyList()

+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return if (checkCondition(entity, condition))
+            tasks.flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
+        else
+            listOf(condition).asVariables()
+    }
+
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return emptyList()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return emptyList()
        return tasks.flatMap { it.createTasks(entity, brainConfigurationContext) }
    }
 }
@@ -8,9 +8,10 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.AttackAngryAtTask
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -19,13 +20,15 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class AttackAngryAtTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "should_attack_angry_at", true).asExpressible()
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return AttackAngryAtTask.create()
    }
 }
@@ -8,24 +8,28 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.VillagerCalmDown

 class CalmDownTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return VillagerCalmDown.create()
    }
 }
@@ -8,30 +8,34 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.DoNothing

 class DoNothingTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+    override fun getVariables(entity: LivingEntity) = listOf(condition, minDurationTicks, maxDurationTicks).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return DoNothing(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return DoNothing(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt())
    }
 }
@@ -8,14 +8,14 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -24,15 +24,21 @@ import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = true
+    var condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_when_hurt", true).asExpressible()
+    var includePassiveDamage = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_from_passive_damage", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        includePassiveDamage
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        val includePassiveDamage = includePassiveDamage.resolveBoolean()
+        if (!condition.resolveBoolean()) return null

        if (entity is NPCEntity) {
            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
@@ -52,7 +58,7 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
                }
            }
-        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
+        } else if (entity is PokemonEntity) {
            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
                battle?.end()
@@ -61,15 +67,17 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {

            return if (includePassiveDamage) {
                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLE))
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                }
            } else {
                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLE))
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                }
            }
-        }*/
+        } else {
+            return null
+        }
    }
 }
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.FindRestingPlaceTask
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class FindRestingPlaceTaskConfig : SingleTaskConfig {
+    val horizontalSearchDistance: ExpressionOrEntityVariable = Either.left("16".asExpression())
+    val verticalSearchDistance: ExpressionOrEntityVariable = Either.left("5".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(horizontalSearchDistance, verticalSearchDistance).asVariables()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(
+            FindRestingPlaceTask.create(horizontalSearchDistance.resolveInt(), verticalSearchDistance.resolveInt()),
+            PokemonEntity::class.java
+        )
+    }
+}
@@ -8,14 +8,12 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +22,24 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FleeAttackerTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_attacker", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier,
+        desiredDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
            SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
            PathfinderMob::class.java
@@ -8,14 +8,13 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +23,20 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FleeNearestHostileTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_nearest_hostile", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, speedMultiplier, desiredDistance).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
            SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
            PathfinderMob::class.java
@@ -8,32 +8,31 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class FollowWalkTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minRunTicks: Expression = "150".asExpression()
-    val maxRunTicks: Expression = "250".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minRunTicks: ExpressionOrEntityVariable = Either.left("150".asExpression())
+    val maxRunTicks: ExpressionOrEntityVariable = Either.left("250".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(minRunTicks, maxRunTicks).asVariables()

    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        return WrapperLivingEntityTask(
-            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
+            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
            PathfinderMob::class.java
        )
    }
@@ -8,26 +8,30 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.ATTACKING_CATEGORY
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.GetAngryAtAttackerTask
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    companion object {
+        const val GET_ANGRY_AT_ATTACKER = "get_angry_at_attacker"
+    }
+
+    val condition = booleanVariable(ATTACKING_CATEGORY, GET_ANGRY_AT_ATTACKER, true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return GetAngryAtAttackerTask.create()
    }
 }
@@ -8,38 +8,43 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.npc.ai.GoToHealingMachineTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

-class GoToHealingMachineTaskConfig(
-    val condition: ExpressionLike = "true".asExpressionLike(),
-    val horizontalSearchRange: Expression = "10".asExpression(),
-    val verticalSearchRange: Expression = "5".asExpression(),
-    val speedMultiplier: Expression = "0.35".asExpression(),
-    val completionRange: Expression = "1".asExpression()
-) : SingleTaskConfig {
+class GoToHealingMachineTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
+    val horizontalSearchRange: ExpressionOrEntityVariable = Either.left("10".asExpression())
+    val verticalSearchRange: ExpressionOrEntityVariable = Either.left("5".asExpression())
+    val completionRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
+    val walkSpeed = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, walkSpeed, horizontalSearchRange, verticalSearchRange, completionRange).asVariables()
+
+    companion object {
+        const val SELF_HEALING = "self_healing"
+        const val USE_HEALING_MACHINES = "use_healing_machines"
+    }
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return GoToHealingMachineTask.create(
-            horizontalSearchRange = horizontalSearchRange,
-            verticalSearchRange = verticalSearchRange,
-            speedMultiplier = speedMultiplier,
-            completionRange = completionRange
+            horizontalSearchRange = horizontalSearchRange.asExpression(),
+            verticalSearchRange = verticalSearchRange.asExpression(),
+            speedMultiplier = walkSpeed.asExpression(),
+            completionRange = completionRange.asExpression()
        )
    }

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.GoToSleepTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class GoToSleepTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(GoToSleepTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,29 +8,33 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.SELF_HEALING
+import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.USE_HEALING_MACHINES
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.HealUsingHealingMachineTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val horizontalUseRange = "3".asExpression()
-    val verticalUseRange = "2".asExpression()
+    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
+    val horizontalUseRange: ExpressionOrEntityVariable = Either.left("2".asExpression())
+    val verticalUseRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, horizontalUseRange, verticalUseRange).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return HealUsingHealingMachineTask(horizontalUseRange, verticalUseRange)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
    }
 }
@@ -8,29 +8,41 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.npc.ai.LookAtBattlingPokemonTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
+    companion object {
+        const val LOOK_AT_BATTLING_POKEMON = "look_at_battling_pokemon"
+    }
+
+    val condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, LOOK_AT_BATTLING_POKEMON, true).asExpressible()
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        minDurationTicks,
+        maxDurationTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!resolveBooleanVariable(LOOK_AT_BATTLING_POKEMON)) return null
        return LookAtBattlingPokemonTask.create(
-            minDurationTicks = runtime.resolveInt(minDurationTicks),
-            maxDurationTicks = runtime.resolveInt(maxDurationTicks)
+            minDurationTicks = minDurationTicks.resolveInt(),
+            maxDurationTicks = maxDurationTicks.resolveInt()
        )
    }
-
 }
@@ -8,29 +8,35 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.SEE_DISTANCE
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget

 class LookAtEntitiesTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val maxDistance = "15".asExpression()
+    companion object {
+        const val LOOK_AT_ENTITIES = "look_at_entities"
+    }
+
+    val condition = booleanVariable(SharedEntityVariables.LOOKING_CATEGORY, LOOK_AT_ENTITIES, true).asExpressible()
+    val maxDistance = numberVariable(SharedEntityVariables.LOOKING_CATEGORY, SEE_DISTANCE, 15).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        maxDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return SetEntityLookTarget.create(runtime.resolveFloat(maxDistance))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return SetEntityLookTarget.create(maxDistance.resolveFloat())
    }
 }
@@ -9,10 +9,12 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.LookAtSpeakerTask
 import net.minecraft.world.entity.LivingEntity

 class LookAtSpeakerTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,33 +8,37 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.LookAtTargetSink

 class LookAtTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks: Expression = "40".asExpression()
-    val maxDurationTicks: Expression = "80".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("160".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        minDurationTicks,
+        maxDurationTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks)), Mob::class.java)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
    }
 }
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.LookAtTargetedBattlePokemonTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class LookAtTargetedBattlePokemonTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return WrapperLivingEntityTask(LookAtTargetedBattlePokemonTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,18 +8,29 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.LOOKING_CATEGORY
 import com.cobblemon.mod.common.entity.ai.LookInDirectionTask
-import com.cobblemon.mod.common.util.asExpression
 import net.minecraft.world.entity.LivingEntity

 class LookInDirectionTaskConfig : SingleTaskConfig {
-    var yaw: Expression = "0".asExpression()
-    var pitch: Expression = "0".asExpression()
+    var condition = booleanVariable(LOOKING_CATEGORY, "locked_rotation", true).asExpressible()
+    var yaw = numberVariable(LOOKING_CATEGORY, "locked_yaw", 0F).asExpressible()
+    var pitch = numberVariable(LOOKING_CATEGORY, "locked_pitch", 0F).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        yaw,
+        pitch
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
-    ) = LookInDirectionTask(yaw, pitch)
+    ) = LookInDirectionTask(
+        shouldLock = condition.asExpression(),
+        yaw = yaw.asExpression(),
+        pitch = pitch.asExpression()
+    )
 }
@@ -8,32 +8,36 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.MeleeAttackTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class MeleeAttackTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    val range = "1.5".asExpression()
-    val cooldownTicks = "30".asExpression()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacks_melee", true).asExpressible()
+    val range = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_range", 1.5F).asExpressible()
+    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 30).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        range,
+        cooldownTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return MeleeAttackTask.create(
-            range = range,
-            cooldownTicks = cooldownTicks
+            range = range.asExpression(),
+            cooldownTicks = cooldownTicks.asExpression()
        )
    }
 }
@@ -9,19 +9,28 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
 import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity

 class MoveToAttackTargetTaskConfig : SingleTaskConfig {
-    val speedMultiplier = "0.5".asExpression()
-    val closeEnoughDistance = "1".asExpression()
+    val speedMultiplier = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacking_movement_speed", 0.5).asExpressible()
+    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        speedMultiplier,
+        closeEnoughDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier,
-        closeEnoughDistance = closeEnoughDistance
+        speedMultiplier = speedMultiplier.asExpression(),
+        closeEnoughDistance = closeEnoughDistance.asExpression()
    )
 }
@@ -0,0 +1,29 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
+import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.MoveToItemAndEatTask
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class MoveToItemAndEatTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
+    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
+        return WrapperLivingEntityTask(
+            MoveToItemAndEatTask(),
+            PokemonEntity::class.java
+        )
+    }
+}
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.MoveToOwnerTask
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class MoveToOwnerTaskConfig : SingleTaskConfig {
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    var completionRange: ExpressionOrEntityVariable = Either.left("4.0".asExpression())
+    var speedMultiplier: ExpressionOrEntityVariable = Either.left("0.4".asExpression())
+    var teleportDistance: ExpressionOrEntityVariable = Either.left("24.0".asExpression())
+    var maxDistance: ExpressionOrEntityVariable = Either.left("14.0".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        completionRange,
+        speedMultiplier,
+        teleportDistance,
+        maxDistance
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(
+            MoveToOwnerTask.create(
+                condition = condition.asExpression(),
+                completionRange = completionRange.asExpression(),
+                speedMultiplier = speedMultiplier.asExpression(),
+                teleportDistance = teleportDistance.asExpression(),
+                maxDistance = maxDistance.asExpression()
+            ),
+            PokemonEntity::class.java
+        )
+    }
+}
@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -34,14 +36,16 @@ import net.minecraft.world.entity.ai.behavior.RunOne
 class OneOfTaskConfig : SingleTaskConfig {
    class OneOfTaskOption {
        val weight: Int = 1
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
    }

    val condition: ExpressionLike = "true".asExpressionLike()
    val options = mutableListOf<OneOfTaskOption>()

+    override fun getVariables(entity: LivingEntity) = options.flatMap { it.task.getVariables(entity) }
+
    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return null
        return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
    }
@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -34,17 +36,19 @@ import net.minecraft.world.entity.ai.behavior.DoNothing
 class RandomTaskConfig : TaskConfig {
    class RandomTaskChoice {
        val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
    }

    val condition: ExpressionLike = "true".asExpressionLike()
    val choices = mutableListOf<RandomTaskChoice>()

+    override fun getVariables(entity: LivingEntity) = choices.flatMap { it.task.getVariables(entity) }
+
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return emptyList()
        val task = choices.weightedSelection { it.weight }?.task ?: throw IllegalStateException("No tasks to choose from in random_task config")
        return task.createTasks(entity, brainConfigurationContext)
@@ -10,10 +10,10 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -31,7 +31,13 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 * @since December 2nd, 2024
 */
 class RunScript : SingleTaskConfig {
-    val script = cobblemonResource("dummy")
+    companion object {
+        const val SCRIPT_CATEGORY = "script"
+    }
+
+    val script = stringVariable(SCRIPT_CATEGORY, "script", "cobblemon:dummy_script").asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(script).asVariables()

    override fun createTask(
        entity: LivingEntity,
@@ -41,8 +47,8 @@ class RunScript : SingleTaskConfig {
            it.registered(MemoryModuleType.LOOK_TARGET) // I think I need to have at least something here?
        ).apply(it) { _ ->
            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: entity.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(script, runtime) == DoubleValue.ONE
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                return@Trigger CobblemonScripts.run(script.resolveString().asIdentifierDefaultingNamespace(), runtime) == DoubleValue.ONE
            }
        }
    }
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+object SharedEntityVariables {
+    const val MOVEMENT_CATEGORY = "movement"
+    const val FEAR_CATEGORY = "fear"
+    const val ATTACKING_CATEGORY = "attacking"
+    const val BATTLING_CATEGORY = "battling"
+    const val LOOKING_CATEGORY = "looking"
+
+    const val WALK_SPEED = "walk_speed"
+    const val FLEE_SPEED_MULTIPLIER = "flee_speed_multiplier"
+    const val FLEE_DESIRED_DISTANCE = "flee_desired_distance"
+    const val SEE_DISTANCE = "see_distance"
+}
@@ -9,10 +9,24 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.DoNothing
+
+interface SingleTaskConfig : TaskConfig {
+    companion object {
+        fun nothing() = object : SingleTaskConfig {
+            override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+            override fun createTask(
+                entity: LivingEntity,
+                brainConfigurationContext: BrainConfigurationContext
+            ): BehaviorControl<in LivingEntity>? {
+                return DoNothing(0, 1)
+            }
+        }
+    }

-fun interface SingleTaskConfig : TaskConfig {
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,31 +8,31 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.StayAfloatTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class StayAfloatTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val chance: Expression = "0.01".asExpression()
+    val condition = booleanVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "can_float", true).asExpressible()
+    val chance = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "float_chance", 0.8F).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        chance
+    ).asVariables()
+
    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        val chance = runtime.resolveFloat(chance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return WrapperLivingEntityTask(
-            StayAfloatTask(chance),
+            StayAfloatTask(chance.resolveFloat()),
            PathfinderMob::class.java
        )
    }
@@ -8,26 +8,26 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead

 class StopBeingAngryIfAttackerDeadTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "stop_being_angry_if_attacker_dead", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return StopBeingAngryIfTargetDead.create()
    }
 }
@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchFromChattingTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -9,12 +9,14 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class SwitchFromFightTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -10,12 +10,14 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+
+class SwitchFromPokemonBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return BehaviorBuilder.create {
+            it.group(it.absent(CobblemonMemories.POKEMON_BATTLE)).apply(it) { _ ->
+                Trigger { level, entity, _ ->
+                    entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                    true
+                }
+            }
+        }
+    }
+}
@@ -11,12 +11,14 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchToActionEffectTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -11,12 +11,14 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class SwitchToChattingTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,11 +8,9 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.Difficulty
 import net.minecraft.world.entity.LivingEntity
@@ -22,9 +20,10 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.schedule.Activity

 class SwitchToFightTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
    val activity = Activity.FIGHT

+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -33,8 +32,7 @@ class SwitchToFightTaskConfig : SingleTaskConfig {
            it.present(MemoryModuleType.ATTACK_TARGET)
        ).apply(it) { _ ->
            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                if (!runtime.resolveBoolean(condition)) return@Trigger false
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                if (entity.commandSenderWorld.getCurrentDifficultyAt(entity.blockPosition()).difficulty == Difficulty.PEACEFUL) return@Trigger false

                entity.brain.setActiveActivityIfPossible(activity)
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -9,27 +9,39 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.Behavior
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.schedule.Activity

 class SwitchToPanicWhenHostilesNearbyTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hostiles_nearby", true).asExpressible()
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
-            .apply(it) { nearestHostile ->
-                Trigger { world, entity, _ ->
-                    (entity as? PathfinderMob)?.navigation?.stop()
-                    entity.brain.setActiveActivityIfPossible(Activity.PANIC)
-                    return@Trigger true
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return BehaviorBuilder.create {
+            it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
+                .apply(it) { nearestHostile ->
+                    Trigger { world, entity, _ ->
+                        (entity as? PathfinderMob)?.navigation?.stop()
+                        entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                        return@Trigger true
+                    }
                }
-            }
+        }
    }
 }
@@ -8,11 +8,10 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -23,16 +22,21 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.schedule.Activity

 class SwitchToPanicWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = false
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hurt", true).asExpressible()
+    var includePassiveDamage =  booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_on_passive_damage", false).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        includePassiveDamage
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return if (includePassiveDamage) {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return if (includePassiveDamage.resolveBoolean()) {
            BehaviorBuilder.create {
                it.group(it.present(MemoryModuleType.HURT_BY))
                    .apply(it) { _ ->
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class SwitchToPokemonBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return SwitchToBattleTask.createForPokemon()
+    }
+}
@@ -10,7 +10,18 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.lang
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveDouble
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.resolveString
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

@@ -23,11 +34,13 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 * @author Hiroku
 * @since October 14th, 2024
 */
-fun interface TaskConfig {
+interface TaskConfig {
    companion object {
        val types = mutableMapOf<String, Class<out TaskConfig>>(
            "one_of" to OneOfTaskConfig::class.java,
            "wander" to WanderTaskConfig::class.java,
+            "water_wander" to WaterWanderTaskConfig::class.java,
+            "air_wander" to AirWanderTaskConfig::class.java,
            "look_at_target" to LookAtTargetTaskConfig::class.java,
            "follow_walk_target" to FollowWalkTargetTaskConfig::class.java,
            "random" to RandomTaskConfig::class.java,
@@ -39,6 +52,9 @@ fun interface TaskConfig {
            "switch_npc_to_battle" to SwitchToNPCBattleTaskConfig::class.java,
            "look_at_battling_pokemon" to LookAtBattlingPokemonTaskConfig::class.java,
            "switch_npc_from_battle" to SwitchFromNPCBattleTaskConfig::class.java,
+            "switch_pokemon_to_battle" to SwitchToPokemonBattleTaskConfig::class.java,
+            "look_at_targeted_battle_pokemon" to LookAtTargetedBattlePokemonTaskConfig::class.java,
+            "switch_pokemon_from_battle" to SwitchFromPokemonBattleTaskConfig::class.java,
            "go_to_healing_machine" to GoToHealingMachineTaskConfig::class.java,
            "heal_using_healing_machine" to HealUsingHealingMachineTaskConfig::class.java,
            "all_of" to AllOfTaskConfig::class.java,
@@ -60,6 +76,11 @@ fun interface TaskConfig {
            "flee_nearest_hostile" to FleeNearestHostileTaskConfig::class.java,
            "run_script" to RunScript::class.java,
            "look_in_direction" to LookInDirectionTaskConfig::class.java,
+            "wake_up" to WakeUpTaskConfig::class.java,
+            "go_to_sleep" to GoToSleepTaskConfig::class.java,
+            "find_resting_place" to FindRestingPlaceTaskConfig::class.java,
+            "move_to_owner" to MoveToOwnerTaskConfig::class.java,
+            "move_to_item_and_eat" to MoveToItemAndEatTaskConfig::class.java,
        )

        val runtime = MoLangRuntime().setup()
@@ -68,6 +89,38 @@ fun interface TaskConfig {
    val runtime: MoLangRuntime
        get() = Companion.runtime

+    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        return expressionOrEntityVariable.resolveBoolean()
+    }
+
+    fun ExpressionOrEntityVariable.asExpression() = map({ it }, { "q.entity.config.${it.variableName}".asExpression() })
+    fun ExpressionOrEntityVariable.resolveString() = runtime.resolveString(asExpression())
+    fun ExpressionOrEntityVariable.resolveBoolean() = runtime.resolveBoolean(asExpression())
+    fun ExpressionOrEntityVariable.resolveInt() = runtime.resolveInt(asExpression())
+    fun ExpressionOrEntityVariable.resolveDouble() = runtime.resolveDouble(asExpression())
+    fun ExpressionOrEntityVariable.resolveFloat() = runtime.resolveFloat(asExpression())
+
+    private fun variable(category: String, name: String, type: MoLangConfigVariable.MoLangVariableType, default: String) = MoLangConfigVariable(
+        variableName = name,
+        category = lang("entity.variable.category.$category"),
+        displayName = lang("entity.variable.$name.name"),
+        description = lang("entity.variable.$name.desc"),
+        type = type,
+        defaultValue = default
+    )
+
+    fun stringVariable(category: String, name: String, default: String) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.TEXT, default = default)
+    fun numberVariable(category: String, name: String, default: Number) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.NUMBER, default = default.toString())
+    fun booleanVariable(category: String, name: String, default: Boolean) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.BOOLEAN, default = default.toString())
+
+    fun getVariableExpression(name: String) = "q.entity.config.$name".asExpression()
+    fun resolveStringVariable(name: String) = runtime.resolveString(getVariableExpression(name))
+    fun resolveBooleanVariable(name: String) = runtime.resolveBoolean(getVariableExpression(name))
+    fun resolveNumberVariable(name: String) = runtime.resolveDouble(getVariableExpression(name))
+
+    /** The variables that this task config uses. These are used to declare variables on the entity cleanly. */
+    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
    /** Given the entity in construction, returns a list of tasks. */
    fun createTasks(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): List<BehaviorControl<in LivingEntity>>
 }
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.WakeUpTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class WakeUpTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(WakeUpTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,23 +8,16 @@

 package com.cobblemon.mod.common.api.ai.config.task

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.RandomStroll
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
@@ -32,20 +25,31 @@ import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.entity.ai.util.LandRandomPos

 class WanderTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val shouldWander: ExpressionLike = "math.random(0, 20 * 8) <= 1".asExpressionLike()
-    val horizontalRange: Expression = "10".asExpression()
-    val verticalRange: Expression = "5".asExpression()
-    val speedMultiplier: Expression = "0.35".asExpression()
-    val completionRange: Expression = "1".asExpression()
-    val lookTargetYOffset: Expression = "1.5".asExpression()
+    companion object {
+        const val WANDER = "wander" // Category
+    }
+
+    val condition = booleanVariable(WANDER, "wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "wander_chance", 1/(20 * 6F)).asExpressible()
+    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 10).asExpressible()
+    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
+
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        wanderChance,
+        horizontalRange,
+        verticalRange,
+        speedMultiplier
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return BehaviorBuilder.create {
            it.group(
@@ -57,12 +61,13 @@ class WanderTaskConfig : SingleTaskConfig {
                        return@Trigger false
                    }

-                    runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                    if (!runtime.resolveBoolean(shouldWander)) return@Trigger false
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                    val wanderChance = wanderChance.resolveFloat()
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false

-                    val targetVec = LandRandomPos.getPos(entity, runtime.resolveInt(horizontalRange), runtime.resolveInt(verticalRange)) ?: return@Trigger false
-                    walkTarget.set(WalkTarget(targetVec, runtime.resolveFloat(speedMultiplier), runtime.resolveInt(completionRange)))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, runtime.resolveDouble(lookTargetYOffset), 0.0)))
+                    val targetVec = LandRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), { 0.0 }) ?: return@Trigger false
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
                    return@Trigger true
                }
            }
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+
+class WaterWanderTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "water_wander_chance", 1/(20 * 3F)).asExpressible()
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    val horizontalRange: ExpressionOrEntityVariable = Either.left("10.0".asExpression())
+    val verticalRange: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(condition, wanderChance, speedMultiplier).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.registered(MemoryModuleType.LOOK_TARGET)
+            ).apply(it) { walkTarget, lookTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isInWater) {
+                        return@Trigger false
+                    }
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                    val wanderChance = wanderChance.resolveFloat()
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
+
+                    val target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt()) ?: return@Trigger false
+                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(target))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
@@ -13,9 +13,13 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
+import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.util.asArrayValue
+import net.minecraft.world.entity.LivingEntity

 /**
 * Event fired when a battle is won by some number of [BattleActor]s.
@@ -40,6 +44,8 @@ data class BattleVictoryEvent (
        "npc_losers" to losers.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
        "wild_pokemon_winners" to winners.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
        "wild_pokemon_losers" to losers.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
+        "scriptable_winners" to winners.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity as? MoLangScriptingEntity }.asArrayValue { (it as LivingEntity).asMostSpecificMoLangValue() },
+        "scriptable_losers" to losers.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity as? MoLangScriptingEntity }.asArrayValue { (it as LivingEntity).asMostSpecificMoLangValue() },
        "players" to battle.actors.filter { it.type == ActorType.PLAYER }.asArrayValue { it.struct },
        "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
        "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct }
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.interaction
-
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonSerializer
-import kotlin.reflect.KClass
-import net.minecraft.resources.ResourceLocation
-
-/**
- * A type adapter for [EntityInteraction]s.
- * For the default implementation with Pokémon entities see [CobblemonPokemonEntityInteractionTypeAdapter].
- *
- * @param T The type of [EntityInteraction].
- *
- * @author Licious
- * @since November 30th, 2022
- */
-interface EntityInteractionTypeAdapter<T : EntityInteraction<*>> : JsonDeserializer<T>, JsonSerializer<T> {
-
-    fun registerInteraction(identifier: ResourceLocation, type: KClass<out T>)
-
-}
@@ -90,11 +90,13 @@ import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.LightningBolt
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.TamableAnimal
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
 import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.Level.ExplosionInteraction
 import net.minecraft.world.level.biome.Biome
@@ -419,6 +421,38 @@ object MoLangFunctions {
                val source = DamageSource(entity.level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolder(DamageTypes.GENERIC).get())
                entity.hurt(source, amount.toFloat())
            }
+            map.put("distance_to_owner") {
+                if (entity !is TamableAnimal) {
+                    return@put DoubleValue.ZERO
+                }
+                val owner = entity.owner ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(entity.distanceTo(owner))
+            }
+            map.put("owner") {
+                if (entity !is TamableAnimal) {
+                    return@put DoubleValue.ZERO
+                }
+                val owner = entity.owner
+                return@put owner?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO
+            }
+            map.put("can_see") { params ->
+                val target = params.get<MoValue>(0)
+                val range = params.getDoubleOrNull(1) ?: 32.0
+                if (target is ObjectValue<*>) {
+                    val targetEntity = target.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                    val vector = targetEntity.eyePosition.subtract(entity.eyePosition).normalize()
+                    val trace = entity.traceEntityCollision(
+                        maxDistance = range.toFloat(),
+                        stepDistance = 0.1F,
+                        direction = vector,
+                        entityClass = targetEntity.javaClass,
+                        collideBlock = ClipContext.Fluid.NONE
+                    )
+                    return@put DoubleValue(targetEntity in (trace?.entities ?: emptyList()))
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
            map.put("walk_to") { params ->
                val x = params.getDouble(0)
                val y = params.getDouble(1)
@@ -698,6 +732,8 @@ object MoLangFunctions {
            map.put("max_hp") { DoubleValue(pokemon.maxHealth.toDouble()) }
            map.put("current_hp") { DoubleValue(pokemon.currentHealth.toDouble()) }
            map.put("friendship") { DoubleValue(pokemon.friendship.toDouble()) }
+            map.put("behaviour") { pokemon.form.behaviour.struct }
+            map.put("behavior") { pokemon.form.behaviour.struct } // Inferior
            map.put("evs") {
                val struct = QueryStruct(hashMapOf())
                for (stat in Stats.PERMANENT) {
@@ -714,6 +750,7 @@ object MoLangFunctions {
            }
            map.put("is_wild") { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
            map.put("is_shiny") { DoubleValue(pokemon.shiny) }
+            map.put("is_in_party") { DoubleValue(pokemon.storeCoordinates.get()?.store is PartyStore) }
            map.put("species") { pokemon.species.struct }
            map.put("form") { StringValue(pokemon.form.name) }
            map.put("weight") { DoubleValue(pokemon.species.weight.toDouble()) }
@@ -997,7 +1034,6 @@ object MoLangFunctions {
            map.put("hitbox_height") { DoubleValue(species.hitbox.height) }
            map.put("hitbox_fixed") { DoubleValue(species.hitbox.fixed) }
            map.put("catch_rate") { DoubleValue(species.catchRate) }
-
            map
        }
    )
@@ -1093,7 +1129,7 @@ object MoLangFunctions {
    }

    /**
-     * Different functions exist depending on
+     * Different functions exist depending on the entity type, this tries to make the struct that's most specific to the type.
     */
    fun LivingEntity.asMostSpecificMoLangValue(): ObjectValue<out LivingEntity> {
        return when (this) {
@@ -1162,6 +1198,7 @@ object MoLangFunctions {
            .flatMap { it.invoke(pokemonEntity).entries }
            .associate { it.key to it.value }
        functions.putAll(addedFunctions)
+        pokemonEntity.registerFunctionsForScripting(this)
        return this
    }

@@ -13,7 +13,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.ai.config.BrainConfig
 import com.cobblemon.mod.common.api.npc.configuration.NPCBattleConfiguration
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.RandomNPCVariationProvider
@@ -45,7 +45,7 @@ class NPCClass {
    var interaction: NPCInteractConfiguration? = null
    var canDespawn = true
    var variations: MutableMap<String, NPCVariationProvider> = mutableMapOf()
-    var config: MutableList<NPCConfigVariable> = mutableListOf()
+    var config: MutableList<MoLangConfigVariable> = mutableListOf()
    var variables = mutableMapOf<String, MoValue>() // Questionable whether this should be here.
    var party: NPCPartyProvider? = null
    var skill: Int = 0
@@ -81,6 +81,7 @@ class NPCClass {
        }
        buffer.writeCollection(config) { _, v ->
            buffer.writeString(v.variableName)
+            buffer.writeText(v.category)
            buffer.writeText(v.displayName)
            buffer.writeText(v.description)
            buffer.writeEnumConstant(v.type)
@@ -127,11 +128,12 @@ class NPCClass {
        }
        config = buffer.readList {
            val variableName = buffer.readString()
+            val category = buffer.readText()
            val displayName = buffer.readText()
            val description = buffer.readText()
-            val type = buffer.readEnumConstant(NPCConfigVariable.NPCVariableType::class.java)
+            val type = buffer.readEnumConstant(MoLangConfigVariable.MoLangVariableType::class.java)
            val defaultValue = buffer.readString()
-            NPCConfigVariable(variableName, displayName, description, type, defaultValue)
+            MoLangConfigVariable(variableName, category, displayName, description, type, defaultValue)
        }.toMutableList()
        skill = buffer.readInt()
        autoHealParty = buffer.readBoolean()
@@ -20,6 +20,8 @@ import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.NPCClasses.getByIdentifier
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.WeightedAspect
@@ -74,6 +76,10 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
        .registerTypeAdapter(WeightedAspect::class.java, WeightedAspectAdapter)
        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
@@ -90,14 +96,6 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
    val classes: Collection<NPCClass>
        get() = this.npcClassesByIdentifier.values

-    init {
-        // NPC additions would be useful
-//        SpeciesAdditions.observable.subscribe {
-//            this.species.forEach(Species::initialize)
-//            this.species.forEach(Species::resolveEvolutionMoves)
-//        }
-    }
-
    /**
     * Finds an NPC class by the pathname of their [ResourceLocation].
     * This method exists for the convenience of finding Cobble default NPC classes.
@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.npc

 import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import net.minecraft.network.chat.Component
@@ -21,7 +21,7 @@ class NPCPreset {
    var resourceIdentifier: ResourceLocation? = null
    var aspects: Set<String>? = null
    var variations: Map<String, NPCVariationProvider>? = null
-    var config: List<NPCConfigVariable>? = null
+    var config: List<MoLangConfigVariable>? = null
    var party: NPCPartyProvider? = null
    var canDespawn: Boolean? = null
    var interaction: NPCInteractConfiguration? = null
@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.WeightedAspect
@@ -70,6 +71,10 @@ object NPCPresets : JsonDataRegistry<NPCPreset> {
        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
@@ -8,46 +8,52 @@

 package com.cobblemon.mod.common.api.npc.configuration

+import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.readString
 import com.cobblemon.mod.common.util.readText
 import com.cobblemon.mod.common.util.writeString
 import com.cobblemon.mod.common.util.writeText
+import com.mojang.datafixers.util.Either
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.Component

 /**
- * A predefined variable that will be declared and filled in on any NPC that extends from the class or preset
- * that specifies this variable. This gives the client a cleaner way to represent a variable that should exist
- * on the NPC.
+ * A predefined variable that will be declared and filled in on any assigned entities. This gives the client
+ * a cleaner way to represent a variable that should exist on the entity.
 *
 * @author Hiroku
 * @since August 14th, 2023
 */
-class NPCConfigVariable(
+class MoLangConfigVariable(
    val variableName: String = "variable",
+    val category: Component = "Variables".asTranslated(),
    val displayName: Component = "Variable".asTranslated(),
-    val description: Component = "A variable that can be used in the NPC's configuration.".asTranslated(),
-    val type: NPCVariableType = NPCVariableType.NUMBER,
+    val description: Component = "A variable that can be used in the entity's configuration.".asTranslated(),
+    val type: MoLangVariableType = MoLangVariableType.NUMBER,
    val defaultValue: String = "0",
 ) {
    companion object {
-        fun decode(buffer: RegistryFriendlyByteBuf): NPCConfigVariable {
-            return NPCConfigVariable(
+        fun decode(buffer: RegistryFriendlyByteBuf): MoLangConfigVariable {
+            return MoLangConfigVariable(
                buffer.readString(),
                buffer.readText(),
                buffer.readText(),
-                buffer.readEnum(NPCVariableType::class.java),
+                buffer.readText(),
+                buffer.readEnum(MoLangVariableType::class.java),
                buffer.readString()
            )
        }
    }

-    enum class NPCVariableType {
+    fun asExpressible(): ExpressionOrEntityVariable = Either.right(this)
+
+    enum class MoLangVariableType {
        NUMBER,
        TEXT,
        BOOLEAN;
@@ -63,17 +69,10 @@ class NPCConfigVariable(

    fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeString(variableName)
+        buffer.writeText(category)
        buffer.writeText(displayName)
        buffer.writeText(description)
        buffer.writeEnum(type)
        buffer.writeString(defaultValue)
    }
-
-    fun apply(npc: NPCEntity, value: MoValue) {
-        npc.config.setDirectly(variableName, value)
-    }
-
-    fun applyDefault(npc: NPCEntity) {
-        npc.config.setDirectly(variableName, type.toMoValue(defaultValue))
-    }
 }
@@ -79,6 +79,7 @@ object CobblemonPermissions {
    val NPC_DELETE = this.create("${COMMAND_PREFIX}npcdelete", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
    val FREEZE_POKEMON = this.create("${COMMAND_PREFIX}freezepokemon", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
    val APPLY_PLAYER_TEXTURE = this.create("${COMMAND_PREFIX}applyplayertexture", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+    val BRAIN_EDIT = this.create("${COMMAND_PREFIX}brainedit", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

    val ABANDON_MULTITEAM = this.create("${COMMAND_PREFIX}abandonmultiteam", PermissionLevel.NONE)

@@ -8,10 +8,13 @@

 package com.cobblemon.mod.common.api.pokemon

+import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.AbilityPool
 import com.cobblemon.mod.common.api.abilities.AbilityTemplate
 import com.cobblemon.mod.common.api.ai.SleepDepth
+import com.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
 import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.drop.DropEntry
@@ -20,6 +23,7 @@ import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
 import com.cobblemon.mod.common.api.pokemon.effect.adapter.ShoulderEffectAdapter
 import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
@@ -51,13 +55,16 @@ import com.google.common.collect.HashBasedTable
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
+import com.mojang.datafixers.util.Either
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.nbt.CompoundTag
+import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.entity.EntityDimensions
+import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.item.Item
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
@@ -71,6 +78,14 @@ object PokemonSpecies : JsonDataRegistry<Species> {

    override val gson: Gson = GsonBuilder()
        .registerTypeAdapter(Stat::class.java, Cobblemon.statProvider.typeAdapter)
+        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
+        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
+        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
+        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
        .registerTypeAdapter(ElementalType::class.java, ElementalTypeAdapter)
        .registerTypeAdapter(AbilityTemplate::class.java, AbilityTemplateAdapter)
        .registerTypeAdapter(ShoulderEffect::class.java, ShoulderEffectAdapter)
@@ -92,6 +107,7 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        .registerTypeAdapter(SleepDepth::class.java, SleepDepth.adapter)
        .registerTypeAdapter(DropEntry::class.java, DropEntryAdapter)
        .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
+        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
@@ -15,5 +15,21 @@ package com.cobblemon.mod.common.battles.dispatch
 * @since July 31st, 2022
 */
 class UntilDispatch(val condition: () -> Boolean) : DispatchResult {
-    override fun canProceed() = condition()
+    var afterAction: (() -> Unit) = {}
+    override fun canProceed(): Boolean {
+        val shouldContinue = condition()
+        if (shouldContinue) {
+            afterAction()
+        }
+        return shouldContinue
+    }
+
+    fun andThen(action: () -> Unit): UntilDispatch {
+        val old = afterAction
+        afterAction = {
+            old()
+            action()
+        }
+        return this
+    }
 }
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.battles.interpreter.instructions
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.interpreter.Effect
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
@@ -69,6 +70,11 @@ class MoveInstruction(
            // For Spread targets the message data only gives the pnx strings. So we can't know what pokemon are actually targeted until the previous messages have been interpreted
            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull() { poke -> poke.getPNX() == it }?.battlePokemon }

+            val targetPokemonEntity = targetPokemon?.entity
+            if (targetPokemonEntity != null) {
+                userPokemon.entity?.brain?.setMemory(CobblemonMemories.TARGETED_BATTLE_POKEMON, targetPokemonEntity.uuid)
+            }
+
            userPokemon.effectedPokemon.let { pokemon ->
                if (UseMoveEvolutionProgress.supports(pokemon, move)) {
                    val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is UseMoveEvolutionProgress && it.currentProgress().move == move }) { UseMoveEvolutionProgress() }
@@ -134,7 +140,11 @@ class MoveInstruction(
            this.future = actionEffect.run(context)
            holds = context.holds // Reference so future things can check on this action effect's holds
            future.thenApply { holds.clear() }
-            return@dispatch UntilDispatch { "effects" !in holds }
+            return@dispatch UntilDispatch { "effects" !in holds }.andThen {
+                val userPokemonId = userPokemon.entity?.uuid ?: return@andThen
+                val targets = hurtTargets.mapNotNull { it.entity }
+                userPokemonId.let { id -> targets.forEach { it.brain.setMemory(CobblemonMemories.TARGETED_BATTLE_POKEMON, id) } }
+            }
        }
    }
 }
@@ -361,7 +361,7 @@ class FossilMultiblockStructure (
            //world.createExplosion(this.createdPokemon?.entity, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), 5F, World.ExplosionSourceType.TNT)

            // instantiate the pokemon as a new entity and spawn it at the location of the machine
-            //var wildPokemon = this.createdPokemon?.sendOut(world as ServerWorld, pos.toVec3d())
+            //var wildPokemon = this.createdPokemon?.sendOut(world as ServerLevel, pos.toVec3d())

            //world.spawnEntity(wildPokemon)
            this.spawn(world, pos, direction, wildPokemon)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.behaviour
+
+import com.cobblemon.mod.common.client.gui.npc.NPCEditorButton
+import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+class BehaviourEditorScreen(
+    val entity: LivingEntity,
+    val appliedPresets: MutableSet<ResourceLocation>,
+) : Screen(Component.literal("Behaviour Editor")) {
+    val unadded: BehaviourOptionsList = addRenderableWidget(
+        BehaviourOptionsList(
+            parent = this,
+            left = 50,
+            entity = entity,
+            appliedPresets = appliedPresets,
+            addingMenu = true
+        )
+    )
+    val added: BehaviourOptionsList = addRenderableWidget(
+        BehaviourOptionsList(
+            parent = this,
+            left = 220,
+            entity = entity,
+            appliedPresets = appliedPresets,
+            addingMenu = false
+        )
+    )
+
+    init {
+        addRenderableWidget(
+            NPCEditorButton(
+                buttonX = 400F,
+                buttonY = 201F,
+                label = lang("ui.generic.save"),
+                alignRight = true
+            ) {
+                // Send packet for updating behaviours of the entity
+                // expect that it will reopen whichever GUI makes sense afterwards
+                SetEntityBehaviourPacket(entity.id, appliedPresets.toSet()).sendToServer()
+            }
+        )
+    }
+
+    fun add(resourceLocation: ResourceLocation) {
+        appliedPresets.add(resourceLocation)
+        unadded.removeEntry(resourceLocation)
+        added.addEntry(resourceLocation)
+    }
+
+    fun remove(resourceLocation: ResourceLocation) {
+        appliedPresets.remove(resourceLocation)
+        added.removeEntry(resourceLocation)
+        unadded.addEntry(resourceLocation)
+    }
+}
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.behaviour
+
+import com.cobblemon.mod.common.CobblemonBrainConfigs
+import com.cobblemon.mod.common.api.ai.BrainPreset
+import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.behaviour.BehaviourOptionsList.BehaviourOptionSlot
+import com.cobblemon.mod.common.client.gui.pokedex.ScaledButton
+import com.cobblemon.mod.common.client.render.drawScaledText
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.components.ContainerObjectSelectionList
+import net.minecraft.client.gui.components.events.GuiEventListener
+import net.minecraft.client.gui.narration.NarratableEntry
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+class BehaviourOptionsList(
+    val parent: BehaviourEditorScreen,
+    val left: Int,
+    val entity: LivingEntity,
+    val appliedPresets: MutableSet<ResourceLocation>,
+    val addingMenu: Boolean // Whether this is the list for the un-added presets
+) : ContainerObjectSelectionList<BehaviourOptionSlot>(
+    Minecraft.getInstance(),
+    // int width, int height, int y, int itemHeight
+    140,
+    200,
+    10,
+    18
+) {
+
+    override fun getScrollbarPosition() = x + width
+
+    fun removeEntry(entry: ResourceLocation) {
+        children().find { it.resourceLocation == entry }?.let { removeEntry(it) }
+    }
+
+    fun addEntry(entry: ResourceLocation) {
+        val brainPreset = CobblemonBrainConfigs.presets[entry] ?: return
+        addEntry(BehaviourOptionSlot(this, entry, brainPreset))
+    }
+
+    init {
+        x = left
+        if (addingMenu) {
+            val unaddedPresets = CobblemonBrainConfigs.presets.filter { it.value.canBeApplied(entity) && it.key !in appliedPresets }
+            unaddedPresets.forEach { (key, value) -> addEntry(BehaviourOptionSlot(this, key, value)) }
+        } else {
+            val addedPresets = appliedPresets.mapNotNull { it to (CobblemonBrainConfigs.presets[it]?.takeIf { it.canBeApplied(entity) } ?: return@mapNotNull null) }
+            addedPresets.forEach { (key, value) -> addEntry(BehaviourOptionSlot(this, key, value)) }
+        }
+    }
+
+    class BehaviourOptionSlot(val parent: BehaviourOptionsList, val resourceLocation: ResourceLocation, val brainPreset: BrainPreset) : Entry<BehaviourOptionSlot>() {
+        val children = mutableListOf<GuiEventListener>()
+        val applyButton = ScaledButton(
+            buttonX = 0F,
+            buttonY = 0F,
+            buttonWidth = 15,
+            buttonHeight = 15,
+            resource = CobblemonResources.RED,
+            scale = 1F,
+            silent = false
+        ) {
+            if (parent.addingMenu) {
+                parent.parent.add(resourceLocation)
+            } else {
+                parent.parent.remove(resourceLocation)
+            }
+        }
+
+        override fun children() = listOf(applyButton)
+
+        override fun narratables() = children.filterIsInstance<NarratableEntry>()
+
+        override fun setFocused(focused: Boolean) {}
+        override fun isFocused() = false
+
+        override fun render(
+            guiGraphics: GuiGraphics,
+            index: Int,
+            top: Int,
+            left: Int,
+            width: Int,
+            height: Int,
+            mouseX: Int,
+            mouseY: Int,
+            hovering: Boolean,
+            partialTick: Float
+        ) {
+            blitk(
+                matrixStack = guiGraphics.pose(),
+                texture = CobblemonResources.WHITE,
+                x = left,
+                y = top,
+                height = height,
+                width = width,
+                textureWidth = 1,
+                textureHeight = 1
+            )
+
+            applyButton.buttonX = left.toFloat() + width - 57
+            applyButton.buttonY = top.toFloat()
+            applyButton.x = left + width - 57
+            applyButton.y = top
+
+            applyButton.render(
+                guiGraphics,
+                mouseX,
+                mouseY,
+                partialTick
+            )
+
+            drawScaledText(
+                context = guiGraphics,
+                text = brainPreset.name.copy(),
+                x = left + 40,
+                y = top + 4,
+                maxCharacterWidth = 120,
+                shadow = false,
+                colour = 0x000000
+            )
+
+            if (hovering) {
+                guiGraphics.renderTooltip(
+                    parent.minecraft.font,
+                    brainPreset.description,
+                    mouseX,
+                    mouseY
+                )
+            }
+        }
+    }
+}
+
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.gui.drawText
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
+import com.cobblemon.mod.common.client.gui.behaviour.BehaviourEditorScreen
 import com.cobblemon.mod.common.client.gui.npc.widgets.ConfigVariableList
 import com.cobblemon.mod.common.client.gui.npc.widgets.NPCRenderWidget
 import com.cobblemon.mod.common.client.gui.npc.widgets.NPCRenderWidget.Companion.HEIGHT
@@ -28,6 +29,7 @@ import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
 import java.util.UUID
+import net.minecraft.world.entity.LivingEntity

 class NPCEditorScreen(
    val npcId: Int,
@@ -89,6 +91,18 @@ class NPCEditorScreen(
            }
        )

+        addRenderableWidget(
+            NPCEditorButton(
+                buttonX = leftX + 70F,
+                buttonY = topY + 201F,
+                label = lang("ui.entity.behaviour_editor"),
+                alignRight = true
+            ) {
+                val entity = this.minecraft!!.level!!.getEntity(npcId) as? LivingEntity ?: return@NPCEditorButton // Unlikely
+                minecraft!!.setScreen(BehaviourEditorScreen(entity = entity, appliedPresets = dto.brainPresets))
+            }
+        )
+
        addRenderableWidget(ConfigVariableList(leftX + 134, topY + 35, this))
    }

@@ -9,9 +9,8 @@
 package com.cobblemon.mod.common.client.gui.npc.widgets

 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.npc.NPCClasses
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable.NPCVariableType
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable.MoLangVariableType
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.npc.NPCEditorButton
 import com.cobblemon.mod.common.client.gui.npc.NPCEditorScreen
@@ -58,12 +57,9 @@ class ConfigVariableList(
        this.y = listY
        correctSize()
        setRenderHeader(false, 0)
-        val npcClass = NPCClasses.getByIdentifier(parent.dto.npcClass)
-        if (npcClass != null) {
-            npcClass.config.forEach { variable ->
-                val value = parent.dto.variables[variable.variableName] ?: variable.defaultValue
-                addEntry(ConfigVariable(variable, value, this))
-            }
+        parent.dto.registeredVariables.sortedBy { it.category.string }.forEach { variable ->
+            val value = parent.dto.variables[variable.variableName] ?: variable.defaultValue
+            addEntry(ConfigVariable(variable, value, this))
        }
    }

@@ -117,7 +113,7 @@ class ConfigVariableList(

    fun isHovered(mouseX: Double, mouseY: Double) = mouseX.toFloat() in (x.toFloat()..(x.toFloat() + WIDTH)) && mouseY.toFloat() in (y.toFloat()..(y.toFloat() + HEIGHT))

-    class ConfigVariable(val variable: NPCConfigVariable, val value: String, private val parent: ConfigVariableList) : Entry<ConfigVariable>() {
+    class ConfigVariable(val variable: MoLangConfigVariable, val value: String, private val parent: ConfigVariableList) : Entry<ConfigVariable>() {
        val client: Minecraft = Minecraft.getInstance()
        var _focused = false
        var children = mutableListOf<GuiEventListener>()
@@ -144,7 +140,7 @@ class ConfigVariableList(
                textValue = it
                parent.parent.dto.variables[variable.variableName] = it
            }
-            if (variable.type == NPCVariableType.NUMBER) {
+            if (variable.type == MoLangVariableType.NUMBER) {
                it.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() || value == "." || value == "-" }
            }
        }
@@ -164,7 +160,7 @@ class ConfigVariableList(
        }

        init {
-            if (variable.type == NPCVariableType.BOOLEAN) {
+            if (variable.type == MoLangVariableType.BOOLEAN) {
                children.add(toggleButton) // children.add(cycleButton)
            } else {
                children.add(editBox)
@@ -195,7 +191,7 @@ class ConfigVariableList(
        ) {
            val x = rowLeft - 4
            val y = rowTop
-            if (variable.type == NPCVariableType.BOOLEAN) {
+            if (variable.type == MoLangVariableType.BOOLEAN) {
                toggleButton.x = x
                toggleButton.y = y + 9
                toggleButton.render(context, mouseX, mouseY, partialTicks)
@@ -205,7 +205,7 @@ class PokedexGUI private constructor(
            clickAction = {
                val searchTypes = SearchByType.entries.toList()
                val selectedIndex = searchTypes.indexOf(selectedSearchByType)
-                selectedSearchByType = searchTypes.get(if (selectedIndex == searchTypes.lastIndex) 0 else (selectedIndex + 1))
+                selectedSearchByType = searchTypes[if (selectedIndex == searchTypes.lastIndex) 0 else (selectedIndex + 1)]
                (it as ScaledButton).resource = cobblemonResource("textures/gui/pokedex/tab_${selectedSearchByType.name.lowercase()}.png")
                updateFilters()
            }
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.net
+
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.client.gui.behaviour.BehaviourEditorScreen
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
+import net.minecraft.client.Minecraft
+import net.minecraft.world.entity.LivingEntity
+
+object OpenBehaviourEditorHandler : ClientNetworkPacketHandler<OpenBehaviourEditorPacket> {
+    override fun handle(packet: OpenBehaviourEditorPacket, client: Minecraft) {
+        val entity = client.level?.getEntity(packet.entityId) as? MoLangScriptingEntity
+        if (entity != null && entity is LivingEntity) {
+            client.setScreen(BehaviourEditorScreen(entity, packet.appliedPresets.toMutableSet()))
+        }
+    }
+}
@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
 import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
 import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3

@@ -34,6 +35,9 @@ class MunchlaxModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
    override val cryAnimation = CryProvider { bedrockStateful("munchlax", "cry") }

    override fun registerPoses() {
+        animations["eat"] = "q.bedrock_stateful('munchlax', 'eat_food', 'endures_primary_animations')".asExpressionLike()
+        animations["eat_multiple"] = "q.bedrock_stateful('munchlax', 'eat_multiple_food', 'endures_primary_animations')".asExpressionLike()
+
        val blink = quirk { bedrockStateful("munchlax", "blink") }
        standing = registerPose(
            poseName = "standing",
@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.*
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository.MixinCompatibilityExclusionStrategy
 import com.cobblemon.mod.common.client.util.exists
 import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
@@ -32,16 +31,16 @@ import com.google.gson.FieldAttributes
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.packs.resources.Resource
-import net.minecraft.server.packs.resources.ResourceManager
-import net.minecraft.world.phys.Vec3
 import java.io.File
 import java.nio.charset.StandardCharsets
 import java.util.Optional
 import java.util.function.BiFunction
 import java.util.function.Function
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.resources.Resource
+import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.world.phys.Vec3

 /**
 * A repository for [PosableModel]s. Can be parameterized with [PosableModel] itself or a subclass.
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.command
+
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.permission.CobblemonPermissions
+import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
+import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
+import com.cobblemon.mod.common.util.commandLang
+import com.cobblemon.mod.common.util.requiresWithPermission
+import com.cobblemon.mod.common.util.traceFirstEntityCollision
+import com.mojang.brigadier.Command
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.context.CommandContext
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.commands.Commands
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.LivingEntity
+
+object BrainEditCommand {
+    fun register(dispatcher : CommandDispatcher<CommandSourceStack>) {
+        dispatcher.register(
+            Commands.literal("brainedit")
+                .requiresWithPermission(CobblemonPermissions.BRAIN_EDIT) { it.player != null }
+                .executes { execute(it, it.source.playerOrException) })
+    }
+
+    private fun execute(context: CommandContext<CommandSourceStack>, player: ServerPlayer) : Int {
+        val targetEntity = player.traceFirstEntityCollision(entityClass = LivingEntity::class.java, ignoreEntity = player)?.takeIf { it is MoLangScriptingEntity }
+        if (targetEntity == null) {
+            player.sendSystemMessage(commandLang("brainedit.non_scriptable").red())
+            return 0
+        }
+
+        if (targetEntity is NPCEntity) {
+            player.sendPacket(OpenNPCEditorPacket(targetEntity))
+        } else {
+            player.sendPacket(OpenBehaviourEditorPacket(targetEntity.id, (targetEntity as MoLangScriptingEntity).behaviours.toSet()))
+        }
+
+        return Command.SINGLE_SUCCESS
+    }
+}
@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.command
 import com.cobblemon.mod.common.api.permission.CobblemonPermissions
 import com.cobblemon.mod.common.command.argument.SpeciesArgumentType
 import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.permission
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
@@ -40,7 +40,7 @@ object ChangeWalkSpeed {
        val pkm = SpeciesArgumentType.getPokemon(context, "pokemon")
        val walkSpeed = FloatArgumentType.getFloat(context, "walkSpeed")

-        pkm.behaviour.moving.walk.walkSpeed = walkSpeed.toString().asExpressionLike()
+        pkm.behaviour.moving.walk.walkSpeed = walkSpeed.toString().asExpression()
        pkm.forms.clear()
        pkm.forms.add(FormData().also { it.initialize(pkm)})
        return Command.SINGLE_SUCCESS
@@ -45,8 +45,8 @@ object CobblemonInfoCommand {
                        .append(this.INDENT)
                        .append(Component.literal("Is Snapshot:").withStyle { it.withColor(ChatFormatting.GRAY) })
                        .append(this.SPACE)
-                        .append(Component.literal(if(CobblemonBuildDetails.SNAPSHOT) "Yes" else "No").withStyle {
-                            it.withColor(if(CobblemonBuildDetails.SNAPSHOT) this.GREEN else this.RED)
+                        .append(Component.literal(if (CobblemonBuildDetails.SNAPSHOT) "Yes" else "No").withStyle {
+                            it.withColor(if (CobblemonBuildDetails.SNAPSHOT) this.GREEN else this.RED)
                        })

                    message.append(this.NEW_LINE)
@@ -47,6 +47,7 @@ import net.minecraft.world.phys.AABB
 import com.mojang.serialization.JsonOps
 import java.io.File
 import java.io.PrintWriter
+import net.minecraft.core.BlockPos

@Suppress("unused")
 object TestCommand {
@@ -67,6 +68,12 @@ object TestCommand {
        try {
            //this.testCodecOutput(context)
            val player = context.source.entity as ServerPlayer
+            val blockState = player.level().getBlockState(BlockPos(18, 62, -83))
+            val block = blockState.block
+            println(block.name.string)
+            println(blockState.isSolid)
+
+
            player.party().forEach { it.currentHealth = it.hp / 2 }
            val npc = NPCEntity(player.level())
            npc.setPos(player.x, player.y, player.z)
@@ -112,10 +119,10 @@ object TestCommand {
 //            val enemyPokemon3 = BattlePokemon(PokemonSpecies.random().create())
 //            val enemyPokemon4 = BattlePokemon(PokemonSpecies.random().create())
 //
-//            enemyPokemon.effectedPokemon.sendOut(player.level() as ServerWorld, player.pos.add(2.0, 0.0, 0.0))
-//            enemyPokemon2.effectedPokemon.sendOut(player.level() as ServerWorld, player.pos.add(-2.0, 0.0, 0.0))
-//            enemyPokemon3.effectedPokemon.sendOut(player.level() as ServerWorld, player.pos.add(0.0, 0.0, 2.0))
-//            enemyPokemon4.effectedPokemon.sendOut(player.level() as ServerWorld, player.pos.add(0.0, 0.0, -2.0))
+//            enemyPokemon.effectedPokemon.sendOut(player.level() as ServerLevel, player.pos.add(2.0, 0.0, 0.0))
+//            enemyPokemon2.effectedPokemon.sendOut(player.level() as ServerLevel, player.pos.add(-2.0, 0.0, 0.0))
+//            enemyPokemon3.effectedPokemon.sendOut(player.level() as ServerLevel, player.pos.add(0.0, 0.0, 2.0))
+//            enemyPokemon4.effectedPokemon.sendOut(player.level() as ServerLevel, player.pos.add(0.0, 0.0, -2.0))
 //
 //            // Start the battle
 //            BattleRegistry.startBattle(
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.entity
-
-import com.bedrockk.molang.runtime.MoLangEnvironment
-import com.bedrockk.molang.runtime.struct.QueryStruct
-
-/**
- * An interface representing an entity that might like to add some variables to a MoLang environment
- * for making animations more adaptive.
- *
- * @author Hiroku
- * @since July 17th, 2023
- */
-interface MoLangEntity {
-    fun applyQueries(queries: QueryStruct)
-    fun applyVariables(environment: MoLangEnvironment)
-}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.entity
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.bedrockk.molang.runtime.struct.VariableStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.ai.BrainPreset
+import com.cobblemon.mod.common.api.molang.MoLangFunctions
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.util.DataKeys
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.nbt.StringTag
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * An interface representing an entity that can have MoLang variables and data. Originally was part of [NPCEntity]
+ * but this interface decouples that logic.
+ *
+ * @author Hiroku
+ * @since December 7th, 2024
+ */
+interface MoLangScriptingEntity {
+    var behavioursAreCustom: Boolean
+    val behaviours: MutableList<ResourceLocation>
+    val registeredVariables: MutableList<MoLangConfigVariable>
+    var config: VariableStruct
+    var data: VariableStruct
+
+    fun getExtraVariables(): List<MoLangConfigVariable> = emptyList()
+    fun remakeBrain()
+
+    fun registerVariables(brainVariables: Collection<MoLangConfigVariable>) {
+        registeredVariables.clear()
+        registeredVariables.addAll(brainVariables)
+        registeredVariables.addAll(getExtraVariables())
+    }
+
+    fun initializeScripting() {
+        registeredVariables.filter { it.variableName !in config.map }.forEach { variable -> config.setDirectly(variable.variableName, variable.type.toMoValue(variable.defaultValue)) }
+        config.map.keys.filter { key -> registeredVariables.none { it.variableName == key } }.forEach { config.map.remove(it) }
+    }
+
+    fun saveScriptingToNBT(nbt: CompoundTag) {
+        nbt.putBoolean(DataKeys.SCRIPTED_BRAIN_IS_CUSTOM, behavioursAreCustom)
+        nbt.put(DataKeys.SCRIPTED_BRAIN_PRESETS, ListTag().also { it.addAll(behaviours.map { StringTag.valueOf(it.toString()) }) })
+        nbt.put(DataKeys.SCRIPTED_DATA, MoLangFunctions.writeMoValueToNBT(data))
+        nbt.put(DataKeys.SCRIPTED_CONFIG, MoLangFunctions.writeMoValueToNBT(config))
+    }
+
+    fun loadScriptingFromNBT(nbt: CompoundTag) {
+        behavioursAreCustom = nbt.getBoolean(DataKeys.SCRIPTED_BRAIN_IS_CUSTOM)
+        behaviours.clear()
+        behaviours.addAll(nbt.getList(DataKeys.SCRIPTED_BRAIN_PRESETS, ListTag.TAG_STRING.toInt()).map { ResourceLocation.parse(it.asString) })
+        data = MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.SCRIPTED_DATA)) as VariableStruct
+        config = if (nbt.contains(DataKeys.SCRIPTED_CONFIG)) MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.SCRIPTED_CONFIG)) as VariableStruct else VariableStruct()
+    }
+
+    fun registerFunctionsForScripting(struct: QueryStruct) {
+        struct.addFunction("config") { config }
+        struct.addFunction("data") { data }
+        struct.addFunction("has_variable") { params -> DoubleValue(registeredVariables.any { it.variableName == params.getString(0) }) }
+    }
+
+    fun updateBehaviours(brainPresets: Collection<ResourceLocation>)
+}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.entity.ai

 import net.minecraft.world.Difficulty
+import com.cobblemon.mod.common.CobblemonMemories
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.OneShot
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
@@ -19,8 +20,9 @@ object AttackAngryAtTask {
    fun create(): OneShot<in LivingEntity> = BehaviorBuilder.create {
        it.group(
            it.present(MemoryModuleType.ANGRY_AT),
-            it.registered(MemoryModuleType.ATTACK_TARGET)
-        ).apply(it) { angryAt, attackTarget ->
+            it.absent(MemoryModuleType.ATTACK_TARGET),
+            it.absent(CobblemonMemories.POKEMON_SLEEPING)
+        ).apply(it) { angryAt, attackTarget, isSleeping ->
            Trigger { world, entity, _ ->
                val angryAt = it.get(angryAt)
                val livingEntity = world.getEntity(angryAt) as? LivingEntity
@@ -33,4 +35,4 @@ object AttackAngryAtTask {
            }
        }
    }
-}
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.entity.ai
+
+import com.cobblemon.mod.common.CobblemonMemories
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.OneShot
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.ai.util.LandRandomPos
+
+object ChooseLandWanderTargetTask {
+    fun create(chance: Int, horizontalRange: Int, verticalRange: Int, walkSpeed: Float, completionRange: Int): OneShot<PathfinderMob> {
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.registered(MemoryModuleType.LOOK_TARGET),
+                it.absent(CobblemonMemories.POKEMON_SLEEPING),
+            ).apply(it) { walkTarget, lookTarget, isSleeping ->
+                Trigger { world, entity, time ->
+                    if (world.random.nextInt(chance) != 0) return@Trigger false
+                    val targetVec = LandRandomPos.getPos(entity, horizontalRange, verticalRange) ?: return@Trigger false
+                    walkTarget.set(WalkTarget(targetVec, walkSpeed, completionRange))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, 1.5, 0.0)))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.entity.ai
+
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.OneShot
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+object FleeFromAttackerTask {
+    fun create(): OneShot<LivingEntity> {
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(MemoryModuleType.HURT_BY_ENTITY),
+                it.registered(MemoryModuleType.AVOID_TARGET)
+            ).apply(it) { hurtByEntity, avoidTarget ->
+                Trigger { _, entity, _ ->
+                    val hurtByEntity = it.get(hurtByEntity)
+                    val avoidTarget = it.tryGet(avoidTarget).orElse(null)
+                    if (avoidTarget != null && avoidTarget == hurtByEntity.uuid) {
+                        return@Trigger false
+                    }
+                    entity.brain.setMemoryWithExpiry(MemoryModuleType.AVOID_TARGET, hurtByEntity, 30 * 20)
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tyzillion	f298f7a157	Added eating particles.	2025-02-03 20:31:41 -05:00
Tyzillion	7ac54d6d6a	I broked the branch. :( So I deleted it and remade it. :)	2025-02-03 13:40:51 -05:00
Paul	a9ed3750ad	Added the wisdom of broccoli to the new water and air wander tasks	2025-01-31 20:48:35 +10:00
Paul	24fdae725e	Merge branch 'main' into smarterer-pokemons	2025-01-31 20:10:17 +10:00
Paul	71fc844905	Wander water, air wander	2025-01-31 08:28:55 +10:00
Paul	24910778d4	Shoved molang structs in more places, you can't stop me	2025-01-27 16:53:44 +10:00
Paul	363c3e5f0a	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2025-01-27 16:36:52 +10:00
Paul	8d336fca3e	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/FormData.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt # common/src/main/resources/data/cobblemon/flows/battle_victory/npc_battle_end_scripts.molang # common/src/main/resources/data/cobblemon/species/generation1/growlithe.json # common/src/main/resources/data/cobblemon/species/generation1/raticate.json # common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json	2025-01-25 11:25:57 +10:00
Paul	ff27676187	Started playing around with more generalised wandering through mediums	2025-01-25 09:48:23 +10:00
Paul	1fd5d0ff4b	Added following owner, resting to Brain AI, restructured base Species AI definitions, fixed DrowsySensor not modulo'ing time	2025-01-24 09:24:15 +10:00
Paul	46752a3911	Pokemon pausing in battles (like the good old days)	2025-01-19 20:31:37 +10:00
Paul	76ad22b53d	License and registration please	2025-01-18 10:01:10 +10:00
Paul	a2ddcaebf8	Minor refactors for Pokemon brains to use brain configs rather than pure presets, translated sleep tasks to data	2025-01-18 09:59:28 +10:00
Paul	6fc725b6ff	Fixed wandering being busted due to the pathfinding malus override (will make fliers less keen to land)	2025-01-15 20:49:58 +10:00
Paul	01efc8d9e0	Task and brain configs are able to check the entity when providing variable list	2025-01-14 22:19:12 +10:00
Paul	3a05bd5e2e	Updating variables now reinitializes brains, fixed too-low default on float chance in StayAfloat tasks	2025-01-08 20:10:32 +10:00
Paul	439c9647ca	Moved Pokémon more properly to the data driven AI, with basic defaults so far, added /brainedit to debug pokemon brains	2025-01-06 14:17:46 +10:00
Paul	eb952319e0	Major refactor of data-driven AI, added variables declarations to task configs, GUI for editing brain presets	2025-01-04 16:26:48 +10:00
Paul	4787c1d35b	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-12-25 15:04:33 +10:00
Paul	98394333da	More variable conversions for the task configs	2024-12-16 19:04:56 +10:00
Paul	653b9be4a3	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/ConfigVariableList.kt	2024-12-16 10:03:13 +10:00
Paul	a3460a4b8f	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/ConfigVariableList.kt # common/src/main/resources/assets/cobblemon/lang/en_us.json	2024-12-15 20:50:05 +10:00
Paul	fd74f157a8	Work on generalised entity brain configurations to apply to pokemon	2024-12-14 10:06:39 +10:00
Paul	885cde045a	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-12-09 11:32:36 +10:00
Paul	bfcaa4bda4	pokemon AI tweaking	2024-12-07 12:23:13 +10:00
Paul	7370841e62	Ported up to latest main	2024-12-06 20:23:28 +10:00
Paul	3c347214a8	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/GiveAllPokemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/AttackAngryAtTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/MoveToAttackTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonMoveControl.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt	2024-12-06 20:12:55 +10:00
Paul	592b4276c8	Added some combat behaviour and reworked activity swapping logic for pokemon brains	2024-10-05 10:47:42 +10:00
Paul	a73cdfbb4f	Removed duplicate class (baffling)	2024-09-29 18:57:36 +10:00
Paul	770a2e52f6	Pokemon but dangerous	2024-09-29 11:41:01 +10:00
Paul	6629b27f33	Fixed issues from merging main	2024-09-29 10:08:06 +10:00
Paul	73b06d2f99	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonMemories.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt	2024-09-29 09:28:03 +10:00
Paul	a07a9a75c0	Ported to mojmaps	2024-08-17 19:19:20 +10:00
Paul	d6fdb4c6da	Merge branch 'sega_bass_pro_fishing_2' into smarterer-pokemons # Conflicts: # common/src/main/java/com/cobblemon/mod/common/GenericsCheatClass.java # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonMemories.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSensors.kt # common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/AttackAngryAtTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/FollowWalkTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/GetAngryAtAttackerTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/MoveToAttackTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/StayAfloatTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonMoveControl.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt # common/src/main/resources/cobblemon-common.accesswidener # fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt # forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt	2024-08-17 10:57:53 +10:00
JazzMcNade	c5e036934a	Added Logic to allow specific pokemon to cause Creepers and Skeletons to flee	2024-07-14 21:18:49 -05:00
JazzMcNade	d9938a5cfd	Added flee on failed capture behavior, prevented sleepwalking, wake up and attack if harmed while sleeping	2024-07-06 03:27:52 -05:00
Tyzillion	fc5d9615fc	Moved the bonemeal detection out of the task and put it in its own sensor.	2024-06-27 14:59:21 -04:00
Tyzillion	e160a42b83	Fixed pokemon class not passing the correct pokemon to the brain upon Pokemon Entity initialization.	2024-06-21 11:32:11 -04:00
Plastered_Crab	fa68aa44c5	- commented out 1 brain task to test other tasks	2024-05-24 09:18:40 -07:00
Plastered_Crab	f3de9840b5	- party pokemon will try to defend their owners better (still wip)	2024-05-23 22:17:00 -07:00
Plastered_Crab	64e3909cea	- party pokemon will try to defend their owners (still wip)	2024-05-22 23:30:16 -07:00
Plastered_Crab	735c4b910e	- pokemon are kill (almost still)	2024-05-22 15:43:02 -07:00
Plastered_Crab	26a9a1f9e1	- pokemon is kill (almost)	2024-05-21 18:02:18 -07:00
amo	832ab8db95	RANDOM BULLSHIT GO	2024-05-20 02:46:43 +01:00
broccoli	1d9029ef51	feature: add fertilizing task	2024-05-16 19:05:07 +01:00
broccoli	a875ba7536	remove comment	2024-05-16 00:22:39 +01:00
broccoli	93de4785b4	use resourceIdentifier instead of pokedex id	2024-05-16 00:22:12 +01:00
broccoli	765f0e5494	feature: make baby pokemon follow more evolved pokemon	2024-05-16 00:13:42 +01:00
broccoli	4fc232ff31	fix: resolve mapping issues by downgrading loom fixes regression in `fd7b82dbe3`	2024-05-14 23:28:33 +01:00
broccoli	a4d75e9f32	refactor: split brain out of entity	2024-05-13 17:38:08 +01:00
broccoli	a86ae09dc9	Merge branch 'main' into smarterer-pokemons	2024-05-12 15:18:56 +01:00
Paul	a5fbafe64d	Import corrections	2024-04-11 12:48:43 +10:00
Paul	1de93b4933	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-11 12:46:21 +10:00
Paul	f8dfc7c6cc	Implemented owner following on Brain pokemon AI	2024-04-11 11:58:46 +10:00
Paul	accbed9c2b	Set up entity AI for battles on Brain system	2024-04-08 13:15:33 +10:00
Paul	8b0e615777	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-08 11:13:12 +10:00
Paul	746f12c724	Migrated the eat grass goal to the brain system	2024-04-06 21:22:26 +10:00
Paul	a11d306a1b	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-06 17:49:24 +10:00
Paul	40d140e84d	Added find resting place AI task	2024-03-25 10:08:55 +10:00
Paul	ffdb4842ac	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-03-18 15:48:32 +10:00
Paul	6baf60d07c	Added CobblemonMemories and Sensors from NPC branch (merge conflicts are future me's problem)	2024-03-18 10:04:43 +10:00
Paul	cb3b7784b0	Fixed pokemon speeds on new brain	2024-03-18 10:04:20 +10:00
Paul	ee4f3b1629	Started giving pokemon brains	2024-03-17 16:43:32 +10:00
Paul	518a7daa0e	Reverted partial run change	2024-03-17 12:46:08 +10:00