curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 18:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

HumanoidNPC: explicit initialiser call no longer required

Browse Source 
Former-commit-id: ecc822302182bc55f9a11ede39f74bfaf8fe6c87
Former-commit-id: 92f49eb574cb4f7bbf93dae8bf0ff32fa33a74ae
This commit is contained in:
Song Minjae
2017-02-05 03:05:18 +09:00
parent e66304bea0
commit 0a2bf64bff
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/gameactors/HumanoidNPC.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameactors.ai.AILuaAPI import net.torvald.terrarum.gameactors.ai.AILuaAPI
import net.torvald.terrarum.gameactors.ai.ActorAI 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.EquipPosition
import net.torvald.terrarum.gameitem.InventoryItem import net.torvald.terrarum.gameitem.InventoryItem
import org.luaj.vm2.* import org.luaj.vm2.*
@@ -26,6 +27,10 @@ open class HumanoidNPC(
born: GameDate born: GameDate
) : ActorHumanoid(born), AIControlled, CanBeAnItem { ) : ActorHumanoid(born), AIControlled, CanBeAnItem {
constructor(luaAi: LuaAIWrapper, born: GameDate) : this(luaAi as ActorAI, born) {
luaAi.attachActor(this)
}
companion object { companion object {
val DEFAULT_COLLISION_TYPE = ActorWithSprite.COLLISION_DYNAMIC val DEFAULT_COLLISION_TYPE = ActorWithSprite.COLLISION_DYNAMIC
} }

1
src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt
View File

@@ -16,7 +16,6 @@ object PlayerBuilderCynthia {
LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"), LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"),
GameDate(100, 143)) // random value thrown GameDate(100, 143)) // random value thrown
InjectCreatureRaw(p.actorValue, "CreatureHuman.json") InjectCreatureRaw(p.actorValue, "CreatureHuman.json")
(p.ai as LuaAIWrapper).attachActor(p)
p.actorValue[AVKey.__PLAYER_QUICKBARSEL] = 0 p.actorValue[AVKey.__PLAYER_QUICKBARSEL] = 0