src/main/java/ru/dbotthepony/kstarbound/lua/LuaJNR.java

@@ -7,7 +7,8 @@ import jnr.ffi.Runtime;
 import jnr.ffi.annotations.IgnoreError;
 import jnr.ffi.annotations.LongLong;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 @SuppressWarnings({"UnnecessaryModifier", "SpellCheckingInspection", "unused"})
 public interface LuaJNR {
@@ -33,7 +34,7 @@ public interface LuaJNR {
 	@IgnoreError
 	public long lua_atpanic(@NotNull Pointer luaState, @LongLong long fn);
 	@IgnoreError
-	public long luaL_traceback(@NotNull Pointer luaState, @NotNull Pointer forState, @Nullable String message, int level);
+	public long luaL_traceback(@NotNull Pointer luaState, @NotNull Pointer forState, @NotNull String message, int level);
 
 	/**
 	 * Creates a new thread, pushes it on the stack, and returns a pointer to a lua_State that represents this new thread. The new thread returned by this function shares with the original thread its global environment, but has an independent execution stack.

src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt

@@ -1,10 +1,7 @@
 package ru.dbotthepony.kstarbound.io
 
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap
-import it.unimi.dsi.fastutil.objects.Object2ObjectMaps
 import ru.dbotthepony.kommons.gson.get
 import ru.dbotthepony.kommons.io.readBinaryString
 import ru.dbotthepony.kommons.io.readVarInt
@@ -51,16 +48,10 @@ class StarboundPak(val path: File, callback: (finished: Boolean, status: String)
 			get() = false
 
 		private var frozen = false
-		private var innerChildren: Object2ObjectMap<String, IStarboundFile> = Object2ObjectArrayMap(2)
+		private val innerChildren = Object2ObjectLinkedOpenHashMap<String, IStarboundFile>()
 
 		fun put(value: IStarboundFile) {
 			check(!frozen) { "Can't put, already frozen!" }
-
-			if (innerChildren is Object2ObjectArrayMap && innerChildren.size >= 8) {
-				innerChildren = Object2ObjectLinkedOpenHashMap(innerChildren)
-				children = Object2ObjectMaps.unmodifiable(innerChildren)
-			}
-
 			innerChildren[value.name] = value
 		}
 
@@ -70,8 +61,7 @@ class StarboundPak(val path: File, callback: (finished: Boolean, status: String)
 			return innerChildren.computeIfAbsent(name, Object2ObjectFunction { SBDirectory(it as String, this) }) as? SBDirectory ?: throw IllegalStateException("$name already exists (in ${computeFullPath()})")
 		}
 
-		override var children: Map<String, IStarboundFile> = Object2ObjectMaps.unmodifiable(innerChildren)
+		override val children: Map<String, IStarboundFile> = Collections.unmodifiableMap(innerChildren)
-			private set
 
 		fun freeze() {
 			check(!frozen) { "Already frozen" }

src/main/kotlin/ru/dbotthepony/kstarbound/lua/LuaSharedState.kt

@@ -71,13 +71,15 @@ class LuaSharedState(val handlesThread: LuaThread, private val cleanable: Cleana
 			val peek = it.peek()
 
 			if (peek == LuaType.STRING) {
-				val err = LuaRuntimeException(it.lua.traceback(it.lua.getString(), 1))
+				it.lua.traceback(it.lua.getString()!!, 1)
+				val err = LuaRuntimeException(it.lua.getString())
 				it.lua.push(err)
 			} else if (peek == LuaType.USERDATA) {
 				val obj = it.nextObject<Any>()
 
 				if (obj is Throwable && obj !is LuaRuntimeException) {
-					val err = LuaRuntimeException(it.lua.traceback(obj.toString(), 1), cause = obj, writeStackTrace = false)
+					it.lua.traceback(obj.toString(), 1)
+					val err = LuaRuntimeException(it.lua.getString(), cause = obj, writeStackTrace = false)
 					it.lua.push(err)
 				}
 			}

src/main/kotlin/ru/dbotthepony/kstarbound/lua/LuaThread.kt

@@ -340,9 +340,8 @@ class LuaThread private constructor(
 		return callConditional(numResults, { block(this); true })!!
 	}
 
-	fun traceback(message: String? = null, level: Int = 0): String {
+	fun traceback(message: String, level: Int = 0) {
 		LuaJNR.INSTANCE.luaL_traceback(pointer, pointer, message, level)
-		return popString()!!
 	}
 
 	fun invokeGlobal(name: String): Boolean {
@@ -1213,13 +1212,10 @@ class LuaThread private constructor(
 
 		fun nextBoolean(position: Int = this.position++): Boolean {
 			if (position !in 1 ..this.top)
-				return false
+				throw IllegalArgumentException("bad argument #$position: boolean expected, got nil")
 
-			return when (typeAt(position)) {
+			return this@LuaThread.getBoolean(position)
-				LuaType.NONE, LuaType.NIL -> false
+				?: throw IllegalArgumentException("bad argument #$position: boolean expected, got ${this@LuaThread.typeAt(position)}")
-				LuaType.BOOLEAN -> this@LuaThread.getBooleanRaw(position)
-				else -> true
-			}
 		}
 	}
 
@@ -1669,18 +1665,8 @@ class LuaThread private constructor(
 					val num = value.asNumber
 
 					when (num) {
-						is Int, is Long -> push(num.toLong())
+						is Int, is Long -> this.push(num.toLong())
-						is Float, is Double -> push(num.toDouble())
+						else -> this.push(num.toDouble())
-						else -> {
-							// lazy parsed number
-							val str = value.asString
-
-							if (str.none { it == '.' } || str.endsWith(".0")) {
-								push(num.toLong())
-							} else {
-								push(num.toDouble())
-							}
-						}
 					}
 				} else if (value.isString) {
 					this.push(value.asString)
@@ -1725,8 +1711,7 @@ class LuaThread private constructor(
 	}
 
 	override fun toString(): String {
-		val p = pointer.address().toString(16)
+		return "LuaThread at ${pointer.address()}"
-		return "LuaThread at 0x${if (p.length < 12) "0".repeat(12 - p.length) else ""}${p}"
 	}
 
 	companion object {

src/main/kotlin/ru/dbotthepony/kstarbound/lua/bindings/AnimatorBindings.kt

@@ -271,8 +271,8 @@ fun provideAnimatorBindings(self: Animator, lua: LuaThread) {
 	lua.pushBinding(self, "rotateGroup", ::rotateGroup)
 	lua.pushBinding(self, "currentRotationAngle", ::currentRotationAngle)
 	lua.pushBinding(self, "targetRotationAngle", ::targetRotationAngle)
-	lua.pushBinding(self, "translateTransformationGroup", ::translateTransformGroup)
+	lua.pushBinding(self, "translateTransformGroup", ::translateTransformGroup)
-	lua.pushBinding(self, "rotateTransformationGroup", ::rotateTransformGroup)
+	lua.pushBinding(self, "rotateTransformGroup", ::rotateTransformGroup)
 	lua.pushBinding(self, "scaleTransformationGroup", ::scaleTransformationGroup)
 	lua.pushBinding(self, "transformTransformationGroup", ::transformTransformationGroup)
 	lua.pushBinding(self, "resetTransformationGroup", ::resetTransformationGroup)

src/main/kotlin/ru/dbotthepony/kstarbound/lua/userdata/BehaviorState.kt

@@ -286,7 +286,6 @@ private fun createBehaviorTree(args: LuaThread.ArgStack): Int {
 
 		push(blackboard)
 		push(root)
-		push(mergedParams.name)
 	}[0]
 
 	args.lua.call {

src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt

@@ -613,7 +613,7 @@ class ActorMovementController() : MovementController() {
 			if (isGroundMovement) {
 				this.isRunning = isRunning && controlMove != null
 				this.isWalking = !isRunning && controlMove != null
-				this.isCrouching = controlCrouch && controlMove == null
+				this.isCrouching = controlCrouch && controlMove != null
 			}
 
 			isFlying = controlFly != null

src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MonsterEntity.kt

@@ -327,10 +327,6 @@ class MonsterEntity(val variant: MonsterVariant, level: Double? = null) : ActorE
 
 	private val deathDamageKinds = ObjectArraySet<String>()
 
-	override fun toString(): String {
-		return "MonsterEntity[${variant.type}@${variant.seed} / ${if (isInWorld) world.toString() else "not in world"} / $position]"
-	}
-
 	override fun experienceDamage(damage: DamageRequestPacket): List<DamageNotification> {
 		val notifications = statusController.experienceDamage(damage.request)
 		val totalDamage = notifications.sumOf { it.healthLost }

src/main/resources/scripts/behavior.lua

@@ -71,13 +71,7 @@ local function blackboardSet(self, t, key, value)
 end
 
 function blackboardPrototype:set(t, key, value)
-	local lookup = mappedParameterTypes[t]
+	blackboardSet(self, mappedParameterTypes[t], key, value)
-
-	if not lookup then
-		error('unknown blackboard value type ' .. tostring(t))
-	end
-
-	blackboardSet(self, lookup, key, value)
 end
 
 function blackboardPrototype:setRaw(t, key, value)
@@ -269,18 +263,21 @@ do
 			return FAILURE
 		end
 
+		if nodeStatus == nil then
+			--table.remove(stack)
+			return RUNNING
+		end
+
 		if nodeExtra ~= nil then
 			blackboard:setOutput(self, nodeExtra)
 		end
 
 		--table.remove(stack)
 
-		if nodeStatus == nil then
+		if nodeStatus then
-			return RUNNING
-		elseif nodeStatus == false then
-			return FAILURE
-		else
 			return SUCCESS
+		else
+			return FAILURE
 		end
 	end
 end
@@ -345,12 +342,22 @@ do
 				return FAILURE
 			end
 
-			if nodeStatus == true then
+			if nodeStatus == nil then
+				local s = coroutine_status(coroutine)
+
+				if s == 'dead' then
+					-- quite unexpected, but whatever
+					--table.remove(stack)
+					return SUCCESS
+				else
+					self.coroutine = coroutine
+				end
+			elseif nodeStatus then
+				--table.remove(stack)
 				return SUCCESS
-			elseif nodeStatus == false then
-				return FAILURE
 			else
-				self.coroutine = coroutine
+				--table.remove(stack)
+				return FAILURE
 			end
 		end
 
@@ -370,10 +377,27 @@ do
 				return FAILURE
 			end
 
-			if nodeStatus == true then
+			if nodeStatus == nil then
-				return SUCCESS
+				-- another yield OR unexpected return?
-			elseif nodeStatus == false then
+
-				return FAILURE
+				local s = coroutine_status(self.coroutine)
+
+				if s == 'dead' then
+					self.coroutine = nil
+					--table.remove(stack)
+					return SUCCESS
+				end
+			else
+				-- yield or return with status
+				self.coroutine = nil
+
+				if nodeStatus then
+					--table.remove(stack)
+					return SUCCESS
+				else
+					--table.remove(stack)
+					return FAILURE
+				end
 			end
 		end
 	end
@@ -437,9 +461,6 @@ function seqNode:run(delta, blackboard, stack)
 
 		self.index = self.index + 1
 	end
-
-	if isSelector then return FAILURE end
-	return SUCCESS
 end
 
 function seqNode:reset()
@@ -573,19 +594,13 @@ function dynNode:run(delta, blackboard, stack)
 	self.calls = self.calls + 1
 	--table.insert(stack, 'DynamicNode')
 
-	local i = 1
+	for i, node in ipairs(self.children) do
-	local children = self.children
+		local status = runAndReset(node, delta, blackboard, stack)
 
-	while i <= self.index do
+		if stauts == FAILURE and self.index == i then
-		local child = children[i]
-		local status = runAndReset(child, delta, blackboard, stack)
-
-		if status == FAILURE and i == self.index then
 			self.index = self.index + 1
-		end
+		elseif status ~= RUNNING and i < self.index then
-
+			node:reset()
-		if i < self.index and (status == SUCCESS or status == RUNNING) then
-			child:reset()
 			self.index = i
 		end
 
@@ -593,8 +608,6 @@ function dynNode:run(delta, blackboard, stack)
 			--table.remove(stack)
 			return status
 		end
-
-		i = i + 1
 	end
 
 	--table.remove(stack)
@@ -679,10 +692,9 @@ end
 local statePrototype = {}
 statePrototype.__index = statePrototype
 
-function statePrototype:ctor(blackboard, root, name)
+function statePrototype:ctor(blackboard, root)
 	self.root = root
 	self._blackboard = blackboard
-	self.name = name or 'unnamed'
 
 	return self
 end

src/main/resources/scripts/world.lua

@@ -90,8 +90,6 @@ local entityTypes = {
 
 local function entityTypeNamesToIntegers(input, fullName)
 	if input then
-		local output = {}
-
 		for i, v in ipairs(input) do
 			-- could have used string.lower, but original engine does case-sensitive comparison here
 			-- so we can save quite a lot cpu cycles for ourselves by not doing string.lower
@@ -101,10 +99,10 @@ local function entityTypeNamesToIntegers(input, fullName)
 				error('invalid entity type ' .. tostring(v) .. ' for ' .. fullName .. ' in types table at index ' .. i, 3)
 			end
 
-			output[i] = lookup
+			input[i] = lookup
 		end
 
-		return output
+		return input
 	end
 end