diff --git a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt index 0959cfb36..4d78cfa0c 100644 --- a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt +++ b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt @@ -3,6 +3,7 @@ package net.torvald.terrarum.gameactors import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameactors.ai.AILuaAPI import net.torvald.terrarum.gameactors.ai.ActorAI +import net.torvald.terrarum.gameactors.ai.LuaAIWrapper import net.torvald.terrarum.gameitem.EquipPosition import net.torvald.terrarum.gameitem.InventoryItem import org.luaj.vm2.* @@ -26,6 +27,10 @@ open class HumanoidNPC( born: GameDate ) : ActorHumanoid(born), AIControlled, CanBeAnItem { + constructor(luaAi: LuaAIWrapper, born: GameDate) : this(luaAi as ActorAI, born) { + luaAi.attachActor(this) + } + companion object { val DEFAULT_COLLISION_TYPE = ActorWithSprite.COLLISION_DYNAMIC } diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt index 543f293c5..4e3a80a12 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt @@ -16,7 +16,6 @@ object PlayerBuilderCynthia { LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"), GameDate(100, 143)) // random value thrown InjectCreatureRaw(p.actorValue, "CreatureHuman.json") - (p.ai as LuaAIWrapper).attachActor(p) p.actorValue[AVKey.__PLAYER_QUICKBARSEL] = 0