Merge branch 'master'

.clang-format

@@ -1,4 +1,6 @@
 BasedOnStyle: LLVM
+
+# Include sorting and grouping
 SortIncludes: CaseSensitive
 IncludeBlocks: Preserve
 IncludeCategories:
@@ -12,3 +14,29 @@ IncludeCategories:
     Priority: 4
   - Regex: ".*"
     Priority: 5
+
+# Indentation settings
+IndentWidth: 2
+UseTab: Never
+IndentAccessModifiers: false
+AccessModifierOffset: 0
+NamespaceIndentation: All
+
+# Line breaking and wrapping
+ColumnLimit: 120
+BreakBeforeTernaryOperators: false
+BreakBeforeBinaryOperators: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+
+# Alignment
+AlignOperands: DontAlign
+AlignAfterOpenBracket: AlwaysBreak
+PointerAlignment: Left
+
+# Parameter formatting
+BinPackParameters: false
+AllowAllParametersOfDeclarationOnNextLine: false
+
+# Code organization
+SeparateDefinitionBlocks: Always

CMakeLists.txt

@@ -5,13 +5,13 @@ project(BlockLua CXX)
 # Export compile_commands.json for VSCode IntelliSense
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Output directories to mirror compile.bat's build folder
+# Output directories to mirror build.bat's build folder
 set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/build)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 
-# Global compile options to mirror compile.bat
+# Global build options to mirror build.bat
 add_compile_options(
   -Wall
   -Werror
@@ -27,14 +27,14 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/inc/lua
 )
 
-# Link directories (for -L.) and libraries from compile.bat
+# Link directories (for -L.) and libraries from build.bat
 link_directories(
   ${CMAKE_SOURCE_DIR}
 )
 
 # Safe DLL
 add_library(BlockLua SHARED src/bllua4.cpp)
-# Ensure output name matches compile.bat
+# Ensure output name matches build.bat
 set_target_properties(BlockLua PROPERTIES OUTPUT_NAME "BlockLua")
 # Linker flags and libraries
 if(MSVC)

build.bat

@@ -1,7 +1,7 @@
 @echo off
 cd /d %~dp0
 
-REM Ensure MinGW32 toolchain is first in PATH (matches compile.bat)
+REM Ensure MinGW32 toolchain is first in PATH
 set "PATH=C:\msys64\mingw32\bin;%PATH%"
 
 REM Configure CMake (generate into build/)

compile.bat

@@ -1,13 +0,0 @@
-@echo off
-cd /d %~dp0
-
-set "PATH=C:\msys64\mingw32\bin;%PATH%"
-
-if not exist build mkdir build
-
-set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 -static-libgcc -static-libstdc++
-
-echo on
-g++ src/bllua4.cpp %buildargs% -o build\BlockLua.dll
-g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o build\BlockLua-Unsafe.dll
-@echo off

compiling.md

@@ -27,7 +27,7 @@ What these packages are for:
 - Run the script:
 
 ```powershell
-compile.bat
+build.bat
 ```
 
 What the script does:
@@ -48,5 +48,5 @@ You should see `architecture: i386` in the output.
 
 ### Notes
 
-- Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won’t work for a 32-bit build.
+- Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won't work for a 32-bit build.
 - If the linker cannot find `-llua5.1`, confirm `mingw-w64-i686-lua51` is installed and you are using the `mingw32` toolchain (not `x86_64`).

inc/lua/lauxlib.h

@@ -20,24 +20,19 @@ typedef struct luaL_Reg {
   lua_CFunction func;
 } luaL_Reg;
 
-LUALIB_API void(luaL_openlib)(lua_State *L, const char *libname,
+LUALIB_API void(luaL_openlib)(lua_State* L, const char* libname, const luaL_Reg* l, int nup);
-                              const luaL_Reg *l, int nup);
+LUALIB_API void(luaL_register)(lua_State* L, const char* libname, const luaL_Reg* l);
-LUALIB_API void(luaL_register)(lua_State *L, const char *libname,
-                               const luaL_Reg *l);
 LUALIB_API int(luaL_getmetafield)(lua_State* L, int obj, const char* e);
 LUALIB_API int(luaL_callmeta)(lua_State* L, int obj, const char* e);
 LUALIB_API int(luaL_typerror)(lua_State* L, int narg, const char* tname);
 LUALIB_API int(luaL_argerror)(lua_State* L, int numarg, const char* extramsg);
-LUALIB_API const char *(luaL_checklstring)(lua_State * L, int numArg,
+LUALIB_API const char*(luaL_checklstring)(lua_State * L, int numArg, size_t* l);
-                                           size_t *l);
+LUALIB_API const char*(luaL_optlstring)(lua_State * L, int numArg, const char* def, size_t* l);
-LUALIB_API const char *(luaL_optlstring)(lua_State * L, int numArg,
-                                         const char *def, size_t *l);
 LUALIB_API lua_Number(luaL_checknumber)(lua_State* L, int numArg);
 LUALIB_API lua_Number(luaL_optnumber)(lua_State* L, int nArg, lua_Number def);
 
 LUALIB_API lua_Integer(luaL_checkinteger)(lua_State* L, int numArg);
-LUALIB_API lua_Integer(luaL_optinteger)(lua_State *L, int nArg,
+LUALIB_API lua_Integer(luaL_optinteger)(lua_State* L, int nArg, lua_Integer def);
-                                        lua_Integer def);
 
 LUALIB_API void(luaL_checkstack)(lua_State* L, int sz, const char* msg);
 LUALIB_API void(luaL_checktype)(lua_State* L, int narg, int t);
@@ -49,8 +44,7 @@ LUALIB_API void *(luaL_checkudata)(lua_State * L, int ud, const char *tname);
 LUALIB_API void(luaL_where)(lua_State* L, int lvl);
 LUALIB_API int(luaL_error)(lua_State* L, const char* fmt, ...);
 
-LUALIB_API int(luaL_checkoption)(lua_State *L, int narg, const char *def,
+LUALIB_API int(luaL_checkoption)(lua_State* L, int narg, const char* def, const char* const lst[]);
-                                 const char *const lst[]);
 
 /* pre-defined references */
 #define LUA_NOREF (-2)
@@ -60,30 +54,23 @@ LUALIB_API int(luaL_ref)(lua_State *L, int t);
 LUALIB_API void(luaL_unref)(lua_State* L, int t, int ref);
 
 LUALIB_API int(luaL_loadfile)(lua_State* L, const char* filename);
-LUALIB_API int(luaL_loadbuffer)(lua_State *L, const char *buff, size_t sz,
+LUALIB_API int(luaL_loadbuffer)(lua_State* L, const char* buff, size_t sz, const char* name);
-                                const char *name);
 LUALIB_API int(luaL_loadstring)(lua_State* L, const char* s);
 
 LUALIB_API lua_State*(luaL_newstate)(void);
 
-LUALIB_API const char *(luaL_gsub)(lua_State * L, const char *s, const char *p,
+LUALIB_API const char*(luaL_gsub)(lua_State * L, const char* s, const char* p, const char* r);
-                                   const char *r);
 
-LUALIB_API const char *(luaL_findtable)(lua_State * L, int idx,
+LUALIB_API const char*(luaL_findtable)(lua_State * L, int idx, const char* fname, int szhint);
-                                        const char *fname, int szhint);
 
 /* From Lua 5.2. */
 LUALIB_API int luaL_fileresult(lua_State* L, int stat, const char* fname);
 LUALIB_API int luaL_execresult(lua_State* L, int stat);
-LUALIB_API int(luaL_loadfilex)(lua_State *L, const char *filename,
+LUALIB_API int(luaL_loadfilex)(lua_State* L, const char* filename, const char* mode);
-                               const char *mode);
+LUALIB_API int(luaL_loadbufferx)(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode);
-LUALIB_API int(luaL_loadbufferx)(lua_State *L, const char *buff, size_t sz,
+LUALIB_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level);
-                                 const char *name, const char *mode);
-LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg,
-                               int level);
 LUALIB_API void(luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup);
-LUALIB_API void(luaL_pushmodule)(lua_State *L, const char *modname,
+LUALIB_API void(luaL_pushmodule)(lua_State* L, const char* modname, int sizehint);
-                                 int sizehint);
 LUALIB_API void*(luaL_testudata)(lua_State * L, int ud, const char* tname);
 LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname);
 
@@ -93,8 +80,7 @@ LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
 ** ===============================================================
 */
 
-#define luaL_argcheck(L, cond, numarg, extramsg)                               \
+#define luaL_argcheck(L, cond, numarg, extramsg) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
-  ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
 #define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL))
 #define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL))
 #define luaL_checkint(L, n) ((int)luaL_checkinteger(L, (n)))
@@ -104,19 +90,16 @@ LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
 
 #define luaL_typename(L, i) lua_typename(L, lua_type(L, (i)))
 
-#define luaL_dofile(L, fn)                                                     \
+#define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
-  (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
 
-#define luaL_dostring(L, s)                                                    \
+#define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
-  (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
 
 #define luaL_getmetatable(L, n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
 
 #define luaL_opt(L, f, n, d) (lua_isnoneornil(L, (n)) ? (d) : f(L, (n)))
 
 /* From Lua 5.2. */
-#define luaL_newlibtable(L, l)                                                 \
+#define luaL_newlibtable(L, l) lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
-  lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
 #define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
 
 /*
@@ -133,8 +116,7 @@ typedef struct luaL_Buffer {
 } luaL_Buffer;
 
 #define luaL_addchar(B, c)                                                                                             \
-  ((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)),     \
+  ((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), (*(B)->p++ = (char)(c)))
-   (*(B)->p++ = (char)(c)))
 
 /* compatibility only */
 #define luaL_putchar(B, c) luaL_addchar(B, c)

inc/lua/lua.h

@@ -143,8 +143,7 @@ LUA_API void(lua_pushnumber)(lua_State *L, lua_Number n);
 LUA_API void(lua_pushinteger)(lua_State* L, lua_Integer n);
 LUA_API void(lua_pushlstring)(lua_State* L, const char* s, size_t l);
 LUA_API void(lua_pushstring)(lua_State* L, const char* s);
-LUA_API const char *(lua_pushvfstring)(lua_State * L, const char *fmt,
+LUA_API const char*(lua_pushvfstring)(lua_State * L, const char* fmt, va_list argp);
-                                       va_list argp);
 LUA_API const char*(lua_pushfstring)(lua_State * L, const char* fmt, ...);
 LUA_API void(lua_pushcclosure)(lua_State* L, lua_CFunction fn, int n);
 LUA_API void(lua_pushboolean)(lua_State* L, int b);
@@ -179,8 +178,7 @@ LUA_API int(lua_setfenv)(lua_State *L, int idx);
 LUA_API void(lua_call)(lua_State* L, int nargs, int nresults);
 LUA_API int(lua_pcall)(lua_State* L, int nargs, int nresults, int errfunc);
 LUA_API int(lua_cpcall)(lua_State* L, lua_CFunction func, void* ud);
-LUA_API int(lua_load)(lua_State *L, lua_Reader reader, void *dt,
+LUA_API int(lua_load)(lua_State* L, lua_Reader reader, void* dt, const char* chunkname);
-                      const char *chunkname);
 
 LUA_API int(lua_dump)(lua_State* L, lua_Writer writer, void* data);
 
@@ -245,8 +243,7 @@ LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud);
 #define lua_isnone(L, n) (lua_type(L, (n)) == LUA_TNONE)
 #define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0)
 
-#define lua_pushliteral(L, s)                                                  \
+#define lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
-  lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
 
 #define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
 #define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
@@ -311,8 +308,7 @@ LUA_API int lua_gethookcount(lua_State *L);
 /* From Lua 5.2. */
 LUA_API void* lua_upvalueid(lua_State* L, int idx, int n);
 LUA_API void lua_upvaluejoin(lua_State* L, int idx1, int n1, int idx2, int n2);
-LUA_API int lua_loadx(lua_State *L, lua_Reader reader, void *dt,
+LUA_API int lua_loadx(lua_State* L, lua_Reader reader, void* dt, const char* chunkname, const char* mode);
-                      const char *chunkname, const char *mode);
 LUA_API const lua_Number* lua_version(lua_State* L);
 LUA_API void lua_copy(lua_State* L, int fromidx, int toidx);
 LUA_API lua_Number lua_tonumberx(lua_State* L, int idx, int* isnum);

inc/lua/luaconf.h

@@ -9,6 +9,7 @@
 #ifndef WINVER
 #define WINVER 0x0501
 #endif
+
 #include <limits.h>
 #include <stddef.h>
 
@@ -75,9 +76,7 @@
 #define LUA_PATH_MARK "?"
 #define LUA_EXECDIR "!"
 #define LUA_IGMARK "-"
-#define LUA_PATH_CONFIG                                                        \
+#define LUA_PATH_CONFIG LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR "\n" LUA_IGMARK "\n"
-  LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR              \
-             "\n" LUA_IGMARK "\n"
 
 /* Quoting in error messages. */
 #define LUA_QL(x) "'" x "'"

inc/lua/luajit.h

@@ -65,13 +65,10 @@ enum {
 LUA_API int luaJIT_setmode(lua_State* L, int idx, int mode);
 
 /* Low-overhead profiling API. */
-typedef void (*luaJIT_profile_callback)(void *data, lua_State *L, int samples,
+typedef void (*luaJIT_profile_callback)(void* data, lua_State* L, int samples, int vmstate);
-                                        int vmstate);
+LUA_API void luaJIT_profile_start(lua_State* L, const char* mode, luaJIT_profile_callback cb, void* data);
-LUA_API void luaJIT_profile_start(lua_State *L, const char *mode,
-                                  luaJIT_profile_callback cb, void *data);
 LUA_API void luaJIT_profile_stop(lua_State* L);
-LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
+LUA_API const char* luaJIT_profile_dumpstack(lua_State* L, const char* fmt, int depth, size_t* len);
-                                             int depth, size_t *len);
 
 /* Enforce (dynamic) linker error for version mismatches. Call from main. */
 LUA_API void LUAJIT_VERSION_SYM(void);

inc/tsfuncs/BlFuncs.cpp

@@ -43,20 +43,21 @@ char *tsf_GetIntArg(signed int value) {
   snprintf(ret, 16, "%d", value);
   return ret;
 }
+
 char* tsf_GetFloatArg(float value) {
   char* ret = tsf_BlStringStack__getArgBuffer(32);
   snprintf(ret, 32, "%g", value);
   return ret;
 }
+
 char* tsf_GetStringArg(char* value) {
   int len = strlen(value) + 1;
   char* ret = tsf_BlStringStack__getArgBuffer(len);
   memcpy(ret, value, len);
   return ret;
 }
-char *tsf_GetThisArg(ADDR obj) {
+
-  return tsf_GetIntArg(*(signed int *)(obj + 32));
+char* tsf_GetThisArg(ADDR obj) { return tsf_GetIntArg(*(signed int*)(obj + 32)); }
-}
 
 // Eval
 
@@ -91,9 +92,7 @@ ADDR tsf_FindObject(unsigned int id) {
   return obj;
 }
 
-ADDR tsf_FindObject(const char *name) {
+ADDR tsf_FindObject(const char* name) { return (ADDR)tsf_BlSim__findObject_name(name); }
-  return (ADDR)tsf_BlSim__findObject_name(name);
-}
 
 ADDR tsf_LookupNamespace(const char* ns, const char* package) {
   const char* ste_package;
@@ -110,14 +109,12 @@ ADDR tsf_LookupNamespace(const char *ns, const char *package) {
     return tsf_BlNamespace__find(nullptr, ste_package);
   }
 }
-ADDR tsf_LookupNamespace(const char *ns) {
+
-  return tsf_LookupNamespace(ns, nullptr);
+ADDR tsf_LookupNamespace(const char* ns) { return tsf_LookupNamespace(ns, nullptr); }
-}
 
 // Object Fields
 
-const char *tsf_GetDataField(ADDR simObject, const char *slotName,
+const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) {
-                             const char *array) {
   const char* ste_slotName;
   if (slotName) {
     ste_slotName = tsf_BlStringTable__insert(slotName, 0);
@@ -128,8 +125,7 @@ const char *tsf_GetDataField(ADDR simObject, const char *slotName,
   return tsf_BlSimObject__getDataField(simObject, ste_slotName, array);
 }
 
-void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
+void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) {
-                      const char *value) {
   const char* ste_slotName;
   if (slotName) {
     ste_slotName = tsf_BlStringTable__insert(slotName, 0);
@@ -142,33 +138,29 @@ void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
 
 // TS Global Variables
 
-const char *tsf_GetVar(const char *name) {
+const char* tsf_GetVar(const char* name) { return tsf_BlCon__getVariable(name); }
-  return tsf_BlCon__getVariable(name);
-}
 
 void tsf_AddVarInternal(const char* name, signed int varType, void* data) {
-  tsf_BlDictionary__addVariable((ADDR *)tsf_gEvalState_globalVars, name,
+  tsf_BlDictionary__addVariable((ADDR*)tsf_gEvalState_globalVars, name, varType, data);
-                                varType, data);
 }
 
-void tsf_AddVar(const char *name, const char **data) {
+void tsf_AddVar(const char* name, const char** data) { tsf_AddVarInternal(name, 10, data); }
-  tsf_AddVarInternal(name, 10, data);
+
-}
+void tsf_AddVar(const char* name, signed int* data) { tsf_AddVarInternal(name, 4, data); }
-void tsf_AddVar(const char *name, signed int *data) {
+
-  tsf_AddVarInternal(name, 4, data);
+void tsf_AddVar(const char* name, float* data) { tsf_AddVarInternal(name, 8, data); }
-}
+
-void tsf_AddVar(const char *name, float *data) {
+void tsf_AddVar(const char* name, bool* data) { tsf_AddVarInternal(name, 6, data); }
-  tsf_AddVarInternal(name, 8, data);
-}
-void tsf_AddVar(const char *name, bool *data) {
-  tsf_AddVarInternal(name, 6, data);
-}
 
 // TS->C Functions
 
-ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname,
+ADDR tsf_AddConsoleFuncInternal(
-                                const char *fname, signed int cbtype,
+    const char* pname,
-                                const char *usage, signed int mina,
+    const char* cname,
+    const char* fname,
+    signed int cbtype,
+    const char* usage,
+    signed int mina,
     signed int maxa) {
   const char* ste_fname = tsf_BlStringTable__insert(fname, 0);
   ADDR ns = tsf_LookupNamespace(cname, pname);
@@ -185,39 +177,63 @@ ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname,
   return ent;
 }
 
-void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
+void tsf_AddConsoleFunc(
-                        tsf_StringCallback sc, const char *usage,
+    const char* pname,
-                        signed int mina, signed int maxa) {
+    const char* cname,
-  ADDR ent =
+    const char* fname,
-      tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
+    tsf_StringCallback sc,
+    const char* usage,
+    signed int mina,
+    signed int maxa) {
+  ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
   *(tsf_StringCallback*)(ent + 40) = sc;
 }
-void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
+
-                        tsf_IntCallback ic, const char *usage, signed int mina,
+void tsf_AddConsoleFunc(
+    const char* pname,
+    const char* cname,
+    const char* fname,
+    tsf_IntCallback ic,
+    const char* usage,
+    signed int mina,
     signed int maxa) {
-  ADDR ent =
+  ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
-      tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
   *(tsf_IntCallback*)(ent + 40) = ic;
 }
-void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
+
-                        tsf_FloatCallback fc, const char *usage,
+void tsf_AddConsoleFunc(
-                        signed int mina, signed int maxa) {
+    const char* pname,
-  ADDR ent =
+    const char* cname,
-      tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
+    const char* fname,
+    tsf_FloatCallback fc,
+    const char* usage,
+    signed int mina,
+    signed int maxa) {
+  ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
   *(tsf_FloatCallback*)(ent + 40) = fc;
 }
-void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
+
-                        tsf_VoidCallback vc, const char *usage, signed int mina,
+void tsf_AddConsoleFunc(
+    const char* pname,
+    const char* cname,
+    const char* fname,
+    tsf_VoidCallback vc,
+    const char* usage,
+    signed int mina,
     signed int maxa) {
-  ADDR ent =
+  ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
-      tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
   *(tsf_VoidCallback*)(ent + 40) = vc;
 }
-void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
+
-                        tsf_BoolCallback bc, const char *usage, signed int mina,
+void tsf_AddConsoleFunc(
+    const char* pname,
+    const char* cname,
+    const char* fname,
+    tsf_BoolCallback bc,
+    const char* usage,
+    signed int mina,
     signed int maxa) {
-  ADDR ent =
+  ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
-      tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
   *(tsf_BoolCallback*)(ent + 40) = bc;
 }
 
@@ -233,42 +249,47 @@ bool tsf_InitInternal() {
       tsf_BlNamespace__createLocalEntry,
       "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? "
       "33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0");
-  BlScanFunctionText(tsf_BlDataChunker__freeBlocks,
+  BlScanFunctionText(
+      tsf_BlDataChunker__freeBlocks,
       "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 "
       "A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33");
-  BlScanFunctionText(tsf_BlCon__evaluate,
+  BlScanFunctionText(
+      tsf_BlCon__evaluate,
       "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? "
       "? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10");
-  BlScanFunctionText(tsf_BlCon__executef,
+  BlScanFunctionText(
+      tsf_BlCon__executef,
       "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 "
       "8B B4 24 ? ? ? ? 33 C9");
-  BlScanFunctionText(tsf_BlCon__executefSimObj,
+  BlScanFunctionText(
+      tsf_BlCon__executefSimObj,
       "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B "
       "B4 24 ? ? ? ? 33 C9");
-  BlScanFunctionText(tsf_BlCon__getVariable,
+  BlScanFunctionText(tsf_BlCon__getVariable, "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?");
-                     "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?");
   BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9");
   BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17");
-  BlScanFunctionText(tsf_BlStringStack__getArgBuffer,
+  BlScanFunctionText(
+      tsf_BlStringStack__getArgBuffer,
       "55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D "
       "08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D");
-  BlScanFunctionText(tsf_BlSimObject__getDataField,
+  BlScanFunctionText(tsf_BlSimObject__getDataField, "51 53 8B D9 55 56 8B 74 24 14");
-                     "51 53 8B D9 55 56 8B 74 24 14");
+  BlScanFunctionText(
-  BlScanFunctionText(tsf_BlSimObject__setDataField,
+      tsf_BlSimObject__setDataField,
       "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 "
       "? ? ? ? 53 8B D9 89 44 24 04");
   BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B");
 
-  ADDR BlScanText(tsf_mCacheSequenceLoc,
+  ADDR BlScanText(
+      tsf_mCacheSequenceLoc,
       "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 "
       "18 8B 44 24 14");
   ADDR BlScanText(
       tsf_mCacheAllocatorLoc,
       "89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? "
       "? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
-  ADDR BlScanText(tsf_gIdDictionaryLoc,
+  ADDR BlScanText(tsf_gIdDictionaryLoc, "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
-                  "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
+  ADDR BlScanText(
-  ADDR BlScanText(tsf_gEvalState_globalVarsLoc,
+      tsf_gEvalState_globalVarsLoc,
       "B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? "
       "? E8 ? ? ? ? E8 ? ? ? ?");
 

inc/tsfuncs/BlFuncs.hpp

@@ -42,21 +42,12 @@ void tsf_AddVar(const char *, signed int *);
 void tsf_AddVar(const char*, float*);
 void tsf_AddVar(const char*, bool*);
 
-ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *,
+ADDR tsf_AddConsoleFuncInternal(const char*, const char*, const char*, signed int, const char*, signed int, signed int);
-                                signed int, const char *, signed int,
+void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_StringCallback, const char*, signed int, signed int);
-                                signed int);
+void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_IntCallback, const char*, signed int, signed int);
-void tsf_AddConsoleFunc(const char *, const char *, const char *,
+void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_FloatCallback, const char*, signed int, signed int);
-                        tsf_StringCallback, const char *, signed int,
+void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_VoidCallback, const char*, signed int, signed int);
-                        signed int);
+void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_BoolCallback, const char*, signed int, signed int);
-void tsf_AddConsoleFunc(const char *, const char *, const char *,
-                        tsf_IntCallback, const char *, signed int, signed int);
-void tsf_AddConsoleFunc(const char *, const char *, const char *,
-                        tsf_FloatCallback, const char *, signed int,
-                        signed int);
-void tsf_AddConsoleFunc(const char *, const char *, const char *,
-                        tsf_VoidCallback, const char *, signed int, signed int);
-void tsf_AddConsoleFunc(const char *, const char *, const char *,
-                        tsf_BoolCallback, const char *, signed int, signed int);
 
 bool tsf_InitInternal();
 
@@ -65,32 +56,20 @@ extern ADDR tsf_mCacheAllocator;
 extern ADDR tsf_gIdDictionary;
 extern ADDR tsf_gEvalState_globalVars;
 
-BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert,
+BlFunctionDefExtern(const char*, __stdcall, tsf_BlStringTable__insert, const char*, bool);
-                    const char *, bool);
+BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char*, const char*);
-BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *,
+BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char*);
-                    const char *);
-BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR,
-                    const char *);
 BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR);
-BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int,
+BlFunctionDefExtern(const char*, , tsf_BlCon__evaluate, ADDR, signed int, const char**);
-                    const char **);
 BlFunctionDefExtern(const char*, , tsf_BlCon__executef, signed int, ...);
-BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *,
+BlFunctionDefExtern(const char*, , tsf_BlCon__executefSimObj, ADDR*, signed int, ...);
-                    signed int, ...);
+BlFunctionDefExtern(const char*, __thiscall, tsf_BlCon__getVariable, const char*);
-BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable,
+BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR*, const char*, signed int, void*);
-                    const char *);
+BlFunctionDefExtern(ADDR*, __thiscall, tsf_BlSim__findObject_name, const char*);
-BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *,
+BlFunctionDefExtern(char*, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int);
-                    const char *, signed int, void *);
+BlFunctionDefExtern(const char*, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char*, const char*);
-BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name,
+BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char*, const char*, const char*);
-                    const char *);
+BlFunctionDefExtern(char*, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int);
-BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer,
-                    unsigned int);
-BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField,
-                    ADDR, const char *, const char *);
-BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR,
-                    const char *, const char *, const char *);
-BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
-                    unsigned int);
 
 // Function short names
 
@@ -114,15 +93,13 @@ BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
 
 #define BlAddFunction tsf_AddConsoleFunc
 
-#define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,     \
+#define __22ND_ARGUMENT(                                                                                               \
-                        a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \
+    a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...)          \
   a22
 #define __NUM_LIST(...)                                                                                                \
-  __22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12,    \
+  __22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
-                  11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
 #define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
-#define BlCallObj(obj, ...)                                                    \
+#define BlCallObj(obj, ...) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
-  tsf_BlCon__executefSimObj((ADDR *)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
 
 #define BlFuncsInit()                                                                                                  \
   if (!tsf_InitInternal()) {                                                                                           \

inc/tsfuncs/BlHooks.cpp

@@ -27,8 +27,7 @@ void tsh_i_InitScanner() {
   HMODULE module = GetModuleHandle(NULL);
   if (module) {
     MODULEINFO info;
-    GetModuleInformation(GetCurrentProcess(), module, &info,
+    GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO));
-                         sizeof(MODULEINFO));
     ImageBase = (ADDR)info.lpBaseOfDll;
     ImageSize = info.SizeOfImage;
   }
@@ -42,8 +41,7 @@ bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char *mask) {
   return (*mask) == 0;
 }
 
-ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern,
+ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE* pattern, char* mask) {
-                       char *mask) {
   for (ADDR i = imageBase; i < imageBase + imageSize; i++) {
     if (tsh_i_CompareData((PBYTE)i, pattern, mask)) {
       return i;
@@ -94,8 +92,7 @@ void tsh_i_PatternTextToCode(char *text, char **opatt, char **omask) {
 
 // Scan using code-style pattern
 ADDR tsh_ScanCode(char* pattern, char* mask) {
-  return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE *)pattern,
+  return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE*)pattern, mask);
-                           mask);
 }
 
 // Scan using a text-style pattern
@@ -119,8 +116,7 @@ ADDR tsh_ScanText(char *text) {
 
 void tsh_DeprotectAddress(ADDR length, ADDR location) {
   DWORD oldProtection;
-  VirtualProtect((void *)location, length, PAGE_EXECUTE_READWRITE,
+  VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection);
-                 &oldProtection);
   // tsh_DeprotectedAddresses[location] = {length, oldProtection};
 }
 
@@ -130,19 +126,13 @@ void tsh_PatchBytes(ADDR length, ADDR location, BYTE *repl) {
   memcpy((void*)location, (void*)repl, (size_t)length);
 }
 
-void tsh_PatchByte(ADDR location, BYTE value) {
+void tsh_PatchByte(ADDR location, BYTE value) { tsh_PatchBytes(location, 1, &value); }
-  tsh_PatchBytes(location, 1, &value);
-}
 
-void tsh_ReplaceInt(ADDR addr, int rval) {
+void tsh_ReplaceInt(ADDR addr, int rval) { tsh_PatchBytes(4, addr, (BYTE*)(&rval)); }
-  tsh_PatchBytes(4, addr, (BYTE *)(&rval));
-}
 
 int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); }
 
-void tsh_i_ReplaceCall(ADDR instr, ADDR target) {
+void tsh_i_ReplaceCall(ADDR instr, ADDR target) { tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target)); }
-  tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target));
-}
 
 void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) {
   for (unsigned int i = 0; i < len; i++) {
@@ -162,8 +152,7 @@ void tsh_UnhookFunction(ADDR victim, BYTE *origbytes) {
   tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data
 }
 
-int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
+int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint) {
-                            bool debugprint) {
   int numpatched = 0;
   for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) {
     if (tsh_i_CompareData((BYTE*)i, (BYTE*)patt, mask)) {
@@ -180,8 +169,7 @@ int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
   return numpatched;
 }
 
-int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
+int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) {
-                           bool debugprint) {
   char* patt;
   char* mask;
   tsh_i_PatternTextToCode(text, &patt, &mask);
@@ -199,9 +187,7 @@ int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
 bool tsh_InitInternal() {
   tsh_i_InitScanner();
 
-  BlScanFunctionText(
+  BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
-      tsh_BlPrintf,
-      "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
 
   return true;
 }

inc/tsfuncs/BlHooks.hpp

@@ -55,8 +55,7 @@ void tsh_PatchInt(ADDR, int);
     return false;                                                                                                      \
   } else {                                                                                                             \
     if (tsh_DEBUGPRINT)                                                                                                \
-      BlPrintf("RedoBlHooks | Found function " #target " at %08x",             \
+      BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target);                                       \
-               (int)target);                                                   \
   }
 #define BlScanFunctionText(target, text)                                                                               \
   target = (tsh_##target##FnT)tsh_ScanText((char*)text);                                                               \
@@ -65,8 +64,7 @@ void tsh_PatchInt(ADDR, int);
     return false;                                                                                                      \
   } else {                                                                                                             \
     if (tsh_DEBUGPRINT)                                                                                                \
-      BlPrintf("RedoBlHooks | Found function " #target " at %08x",             \
+      BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target);                                       \
-               (int)target);                                                   \
   }
 #define BlScanCode(target, patt, mask)                                                                                 \
   target = tsh_ScanCode((char*)patt, (char*)mask);                                                                     \
@@ -90,13 +88,8 @@ void tsh_PatchInt(ADDR, int);
 // Use in code to define the data and functions for hooking a function
 #define BlFunctionHookDef(func)                                                                                        \
   BYTE tsh_BlFunctionHook##func##Data[6];                                                                              \
-  void func##HookOn() {                                                        \
+  void func##HookOn() { tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); }              \
-    tsh_HookFunction((ADDR)func, (ADDR)func##Hook,                             \
+  void func##HookOff() { tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); }
-                     tsh_BlFunctionHook##func##Data);                          \
-  }                                                                            \
-  void func##HookOff() {                                                       \
-    tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data);            \
-  }
 // Use in code to initialize the hook once
 #define BlFunctionHookInit(func)                                                                                       \
   tsh_DeprotectAddress(6, (ADDR)func);                                                                                 \
@@ -104,17 +97,14 @@ void tsh_PatchInt(ADDR, int);
 
 // Replace all matches of the pattern with the given byte string
 #define BlPatchAllMatchesCode(len, patt, mask, repl)                                                                   \
-  tsh_PatchAllMatchesCode((ADDR)len, (char *)patt, (char *)mask, (char *)repl, \
+  tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT);
-                          tsh_DEBUGPRINT);
 #define BlPatchAllMatchesText(len, text, repl)                                                                         \
-  tsh_PatchAllMatchesCode((ADDR)len, (char *)text, (char *)repl,               \
+  tsh_PatchAllMatchesCode((ADDR)len, (char*)text, (char*)repl, tsh_DEBUGPRINT);
-                          tsh_DEBUGPRINT);
 
 // Deprotect and replace one byte
 #define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte);
 // Deprotect and replace a byte string
-#define BlPatchBytes(len, addr, repl)                                          \
+#define BlPatchBytes(len, addr, repl) tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE*)repl);
-  tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE *)repl);
 
 // BlPrintf(char* format, ...)
 #define BlPrintf(...)                                                                                                  \

readme.md

@@ -1,25 +1,26 @@
-
 # BlockLua
 
 Lua scripting for Blockland
 
 ## How to Install
+
 - Install RedBlocklandLoader
 - Copy `lua5.1.dll` into your Blockland install folder, next to `Blockland.exe`
 - Copy `BlockLua.dll` into the `modules` folder within the Blockland folder
 
-
 ## Quick Reference
 
 ### From TorqueScript
+
 `'print('hello world')` - Execute Lua in the console by prepending a `'` (single quote)
 `luaeval("code");` - Execute Lua code
-`luacall("funcName", %args...);` - Call a Lua global function  
+`luacall("funcName", %args...);` - Call a Lua function (supports indexing tables and object methods)
-`luaexec("fileName");` - Execute a Lua file. Path rules are the same as executing .cs files.  
+`luaexec("fileName");` - Execute a Lua file. Path rules are the same as when executing .cs files, relative paths are allowed.
-`luaget("varName");` - Read a Lua global variable  
+`luaget("varName");` - Read a Lua global variable (supports indexing tables)
-`luaset("varName", %value);` - Write a Lua global variable  
+`luaset("varName", %value);` - Write a Lua global variable (supports indexing tables)
 
 ### From Lua
+
 `bl.eval('code')` - Eval TorqueScript code
 `bl.funcName(args)` - Call a TorqueScript function
 `bl.varName` - Read a TorqueScript global variable
@@ -28,6 +29,7 @@ Lua scripting for Blockland
 `bl['namespaceName::funcName'](args)` - Call a namespaced TorqueScript function
 
 ### Accessing Torque Objects from Lua
+
 `bl.objectName` - Access a Torque object by name
 `bl[objectID]` - Access a Torque object by ID (or name)
 `object.fieldOrKey` - Read a field or Lua key from a Torque object
@@ -35,26 +37,43 @@ Lua scripting for Blockland
 `object.key = value` - Associate Lua data with a Torque object
 `object:method(args)` - Call a Torque object method
 `object[index]` - Access a member of a Torque set or group
-`for childIndex, child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
+`for child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
+`bl.isObject(object, objectID, or 'objectName')` - Check if an object exists
+`object:exists()` - Check if an object exists
 
 ### Timing/Schedules
+
 `sched = bl.schedule(timeMs, function, args...)` - Schedule a Lua function to be called later, similar to schedule in Torque
 `sched:cancel()` - Cancel a previously scheduled timer
 
 ### Raycasts and Searches
+
 `hitObject, hitPos, hitNormal = bl.raycast(vector{startPosX,y,z}, vector{endPosX,y,z}, 'objtype'/{'objtypes',...}, ignoreObjects...?)` - Cast a ray in the world over objects of the specified type(s) (possibly excluding some objects), and return the object hit, the position of the hit, and the normal vector to the surface hit. See the Types section for a list of valid object types.
 `for object in bl.boxSearch(vector{centerX,y,z}, vector{sizeX,y,z}, 'objtype'/{'objtypes',...}) do` - Find all objects in the world of the specified type(s) whose bounding box overlaps with the specified box. See the Types section for a list of valid object types.
 `for object in bl.radiusSearch(vector{centerX,y,z}, radius, 'objtype'/{'objtypes',...}) do` - Find all objects of the specified type(s) whose bounding box overlaps with the specified sphere. See the Types section for a list of valid object types.
 
+### List of Object Classes (for raycasts and searches)
+
+`'all'` - Any object
+`'player'` - Players or bots
+`'item'` - Items
+`'vehicle'` - Vehicles
+`'projectile'` - Projectiles
+`'brick'` - Bricks with raycasting enabled
+`'brickalways'` - All bricks including those with raycasting disabled
+Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`
+
 ### Server-Client Communication
-`bl.addServerCmd('commandName', function(client, args...) yourCode end)` - Register a /command on the server  
+
-`bl.addClientCmd('commandName', function(args...) yourCode end)` - Register a client command on the client  
+`bl.addServerCmd('commandName', function(client, args...) ... end)` - Register a /command on the server
-`bl.commandToServer('commandName', args...)` - Execute a server command as a client  
+`bl.addClientCmd('commandName', function(args...) ... end)` - Register a client command on the client
-`bl.commandToClient('commandName', args...)` - As the server, execute a client command on a specific client  
+`bl.commandToServer('commandName', args...)` - As a client, execute a server command
+`bl.commandToClient(client, 'commandName', args...)` - As the server, execute a client command on a specific client
 `bl.commandToAll('commandName', args...)` - As the server, execute a client command on all clients
 
 ### Packages/Hooks
-`bl.hook('packageName', 'functionName', 'before'/'after', function(args) yourCode end)` - Hook a Torque function with a Lua function.  
+
+`bl.hook('packageName', 'functionName', 'before'/'after', function(args) ... end)` - Hook a Torque function with a Lua function.
 `args` is an array containing the arguments provided to the function. If the hook is `before`, these can be modified before being passed to the parent function.
 If `args._return` is set to anything other than nil by a `before` hook, the parent function will not be called, and the function will simply return that value. Also in this case, any `after` hook will not be executed.
 In an `after` hook, `args._return` is set to the value returned by the parent function, and can be modified.
@@ -63,10 +82,12 @@ In an `after` hook, `args._return` is set to the value returned by the parent fu
 `bl.unhook('packageName')` - Remove any previously defined hooks within the package
 
 ### Modules and Dependencies
+
 `dofile('Add-Ons/Path/file.lua')` - Execute a Lua file. Relative paths (`./file.lua`) are allowed. `..` is not allowed.
 
 `require('modulePath.moduleName')` - Load a Lua file or external library.
 `require` replaces `.` with `/` in the path, and then searches for files in the following order:
+
 - `./modulePath/moduleName.lua`
 - `./modulePath/moduleName/init.lua`
 - `modulePath/moduleName.lua` (Relative to game directory)
@@ -78,6 +99,7 @@ In an `after` hook, `args._return` is set to the value returned by the parent fu
 Like in standard Lua, modules loaded using `require` are only executed the first time `require` is called with that path (from anywhere). Subsequent calls simply return the result from the initial execution. To allow hot reloading, use `dofile`.
 
 ### File I/O
+
 Lua's builtin file I/O is emulated, and is confined to the same directories as TorqueScript file I/O.
 Relative paths (`./`) are allowed. `..` is not allowed.
 `file = io.open('./file.txt', 'r'/'w'/'a'/'rb'/'wb'/'ab')` - Open a file
@@ -88,6 +110,7 @@ Reading files from ZIPs is supported, with caveats. Null characters are not allo
 When reading from outside ZIPs, binary files are fully supported.
 
 ### Object Creation
+
 `bl.new('className')` - Create a new Torque object
 `bl.new('className', {fieldName = value, ...})` - Create a new Torque object with the given fields
 `bl.new('className objectName', fields?)` - Create a new named Torque object
@@ -96,15 +119,18 @@ When reading from outside ZIPs, binary files are fully supported.
 `bl.datablock('datablockClassName datablockName:parentDatablockName', fields?)` - Create a new datablock with inheritance
 
 ### Classes and Types
+
 `bl.type('varName', 'type')` - Register the type of a Torque global variable, for conversion when accessing from Lua. Valid types are 'boolean', 'object', 'string' (prevents automatic conversion), and nil (default, applies automatic conversion).
 `bl.type('funcName', 'type')` - Register the return type of a Torque function, for conversion when calling from Lua. Valid types are 'bool', 'object', and nil - all other conversion is automatic. Already done for all default functions.
 `bl.type('className::funcName', 'type')` - Register the return type of a Torque object method.
 `bl.class('className')` - Register an existing Torque class to be used from Lua. Already done for all built-in classes.
 `bl.class('className', 'parentClassName')` - Same as above, with inheritance
-`bl.boolean(thing)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.  
+`bl.boolean(arg)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.
-`bl.object(thing)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
+`bl.object(arg)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
+`bl.string(arg)` - Manually convert any automatically-converted Torque value back into a string. This is not as reliable as using `bl.type` to specify the type as a string beforehand.
+
+### Vector
 
-### Vectors
 `vec = vector{x,y,z}` - Create a vector. Can have any number of elements
 `vec1 + vec2` - Add
 `vec1 - vec2` - Subtract
@@ -129,15 +155,22 @@ When reading from outside ZIPs, binary files are fully supported.
 `vec1:distance(vec2)` - Distance between two points
 `vec2 = vec:copy()` - Clone a vector so its elements can be modified without affecting the original. Usually not needed - the builtin vector functions never modify vectors in-place.
 
+### Matrix
+
+WIP
+
 ### Extended Standard Lua Library
-`string[index]`  
+
-`string[{start,stop}]`  
+`str[index]`
+`str[{start,stop}]`
 `string.split(str, separator='' (splits into chars), noregex=false)`
 `string.bytes(str)`
 `string.trim(str, charsToTrim=' \t\r\n')`
 `table.empty`
 `table.map(func, ...)`
+`table.mapk(func, ...)`
 `table.map_list(func, ...)`
+`table.mapi_list(func, ...)`
 `table.swap(tbl)`
 `table.reverse(list)`
 `table.islist(list)`
@@ -161,43 +194,47 @@ When reading from outside ZIPs, binary files are fully supported.
 `math.clamp(num, min, max)`
 
 ## Type Conversion
+
 When a TorqueScript function is called from Lua or vice-versa, the arguments and return value must be converted between the two languages' type systems.
 TorqueScript stores no type information; all values in TorqueScript are strings. So it's necessary to make some inferences when converting values between the two languages.
-### From TorqueScript to Lua
+
-- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.  
-- The empty string "" becomes `nil`  
-- A string containing three numbers separated by spaces becomes a `vector`  
-- A string containing six numbers separated by spaces becomes a table of two vectors  
-- Any other string is passed directly as a `string`
 ### From Lua to TorqueScript
+
 - `nil` becomes the empty string ""
 - `true` and `false` become "1" and "0" respectively
-- Torque containers become their object ID  
+- A Torque object container becomes its object ID
 - A `vector` becomes a string containing three numbers separated by spaces
-- A table of two vectors becomes a string containing six numbers separated by spaces  
+- A table of two `vector`s becomes a string containing six numbers separated by spaces
+- (WIP) A `matrix` is converted into an axis-angle (a "transform"), a string containing seven numbers separated by spaces
 - Any `string` is passed directly as a string
 - Tables cannot be passed and will throw an error
 
+### From TorqueScript to Lua
+
+- The empty string "" becomes `nil`
+- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.
+- A string containing two or three numbers separated by single spaces becomes a `vector`
+- A string containing six numbers separated by single spaces becomes a table of two vectors, usually defining the corners a bounding box
+- (WIP) A string containing seven numbers separated by single spaces is treated as an axis-angle (a "transform"), and is converted into a `matrix` representing the translation and rotation
+- Any other string is passed directly as a `string`
+
+For scenarios where the automatic TorqueScript->Lua conversion rules are insufficient or incorrect, use `bl.type`.
+To convert things by hand, use `bl.object`, `bl.boolean`, or `bl.string`.
+
 ## I/O and Safety
+
 All Lua code is sandboxed, and file access is confined to the default directories in the same way TorqueScript is.
 BlockLua also has access to any C libraries installed in the `modules/lualib` folder, so be careful throwing things in there.
-### Unsafe Mode
-BlockLua can be built in Unsafe Mode by specifying the `-DBLLUA_UNSAFE` compiler flag. This removes the sandboxing of Lua code, allowing it to access any file and use any library, including ffi.  
-Please do not publish add-ons that require unsafe mode.  
 
-### List of Object Types
+### Unsafe Mode
-`'all'` - Any object  
+
-`'player'` - Players or bots  
+BlockLua can be built in Unsafe Mode by specifying the `-DBLLUA_UNSAFE` compiler flag. This removes the sandboxing of Lua code, allowing it to access any file and use any library, including ffi.
-`'item'` - Items  
+A more limited option is `-DBLLUA_ALLOWFFI`, which allows the use of the `ffi` library. This can still be exploited to grant all the same access as full unsafe mode.
-`'vehicle'` - Vehicles  
+Please do not publish add-ons that require either of these.
-`'projectile'` - Projectiles  
-`'brick'` - Bricks with raycasting enabled  
-`'brickalways'` - All bricks including those with raycasting disabled  
-Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`  
 
 ## Compiling
 
-With any *32-bit* variant of GCC installed (such as MinGW or MSYS2), run the following command in the repo directory:  
+With any _32-bit_ variant of GCC installed (such as MinGW or MSYS2), run the following command in the repo directory:
-`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 src/bllua`  
+`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1`
 
 LuaJIT (lua5.1.dll) can be obtained from https://luajit.org/

src/bllua4.cpp

@@ -1,4 +1,4 @@
-// BlockLua (bllua4): Simple Lua interface for TorqueScript
+// BlockLua (bllua4): Advanced Lua interface for TorqueScript
 
 // Includes
 
@@ -31,6 +31,7 @@ INCLUDE_BIN(bll_fileLuaEnv, "lua-env.lua");
 INCLUDE_BIN(bll_fileTsEnv, "ts-env.cs");
 INCLUDE_BIN(bll_fileLuaStd, "util/std.lua");
 INCLUDE_BIN(bll_fileLuaVector, "util/vector.lua");
+INCLUDE_BIN(bll_fileLuaMatrix, "util/matrix.lua");
 INCLUDE_BIN(bll_fileLuaLibts, "util/libts-lua.lua");
 INCLUDE_BIN(bll_fileTsLibts, "util/libts-ts.cs");
 INCLUDE_BIN(bll_fileLuaLibbl, "util/libbl.lua");
@@ -59,23 +60,27 @@ bool init() {
 
   // Set up Lua environment
   BLL_LOAD_LUA(gL, bll_fileLuaEnv);
+#ifdef BLLUA_ALLOWFFI
+  lua_pushboolean(gL, true);
+  lua_setglobal(gL, "_bllua_allowffi");
+#endif
 #ifndef BLLUA_UNSAFE
   BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe);
 #endif
 
-  // Expose Lua API to TS
+  // Load utilities in Lua
-  BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall,
-                "LuaCall(name, ...) - Call Lua function and return result", 2,
-                20);
-  BlEval(bll_fileTsEnv);
-
-  // Load utilities
   BLL_LOAD_LUA(gL, bll_fileLuaStd);
   BLL_LOAD_LUA(gL, bll_fileLuaVector);
+  BLL_LOAD_LUA(gL, bll_fileLuaMatrix);
   BLL_LOAD_LUA(gL, bll_fileLuaLibts);
-  BlEval(bll_fileTsLibts);
   BLL_LOAD_LUA(gL, bll_fileLuaLibbl);
   BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes);
+
+  // Expose Lua API to TS
+  BlAddFunction(
+      NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
+  BlEval(bll_fileTsEnv);
+  BlEval(bll_fileTsLibts);
   BlEval(bll_fileTsLibblSupport);
   BlEval(bll_fileLoadaddons);
 
@@ -88,8 +93,7 @@ bool init() {
 bool deinit() {
   BlPrintf("BlockLua: Unloading");
 
-  BlEval("deactivatePackage(_bllua_main);");
+  BlEval("$_bllua_active=0;deactivatePackage(_bllua_main);");
-  BlEval("$_bllua_active = 0;");
   bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end");
 
   lua_close(gL);

src/lua-env-safe.lua

@@ -14,6 +14,7 @@ local old_require = require
 local old_os = os
 local old_debug = debug
 local old_package = package
+local old_allowffi = _bllua_allowffi
 
 -- Remove all global variables except a whitelist
 local ok_names = tmap {
@@ -39,13 +40,10 @@ end
 
 -- Sanitize file paths to point only to allowed files within the game directory
 -- List of allowed directories for reading/writing
+-- modules/lualib is also allowed as read-only
 local allowed_dirs = tmap {
   'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
 }
--- List of allowed directories for reading only
-local allowed_dirs_readonly = tmap {
-  'lualib'
-}
 -- List of disallowed file extensions - basically executable file extensions
 -- Note that even without this protection, exploiting would still require somehow
 --   getting a file within the allowed directories to autorun,
@@ -64,6 +62,9 @@ local disallowed_exts = tmap {
 -- Return: clean file path if allowed (or nil if disallowed),
 --         error string (or nil if allowed)
 local function safe_path(fn, readonly)
+  if type(fn) ~= 'string' then
+    return nil, 'Filename must be a string'
+  end
   fn = fn:gsub('\\', '/')
   fn = fn:gsub('^ +', '')
   fn = fn:gsub(' +$', '')
@@ -81,14 +82,15 @@ local function safe_path(fn, readonly)
   end
   -- allow only whitelisted dirs
   local dir = fn:match('^([^/]+)/')
-  if (not dir) or (
+  if not (dir and (
-        (not allowed_dirs[dir:lower()]) and
+        allowed_dirs[dir:lower()] or
-        ((not readonly) or (not allowed_dirs_readonly[dir:lower()]))) then
+        (readonly and fn:find('^modules/lualib/'))))
-    return nil, 'filename is in disallowed directory ' .. (dir or 'nil')
+  then
+    return nil, 'File is in disallowed directory ' .. (dir or 'nil')
   end
-  -- disallow blacklisted extensions or no extension
+  -- disallow blacklisted extensions
   local ext = fn:match('%.([^/%.]+)$')
-  if (not ext) or (disallowed_exts[ext:lower()]) then
+  if ext and disallowed_exts[ext:lower()] then
     return nil, 'Filename \'' .. fn .. '\' has disallowed extension \'' ..
         (ext or '') .. '\''
   end
@@ -120,6 +122,7 @@ local disallowed_packages = tmap {
   'ffi', 'debug', 'package', 'io', 'os',
   '_bllua_ts',
 }
+if old_allowffi then disallowed_packages['ffi'] = nil end
 function _bllua_requiresecure(name)
   if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or
       name:find('^%.') or name:find('%.$') then
@@ -143,4 +146,5 @@ debug = {
   getfilename = old_debug.getfilename, -- defined in lua.env.lua
 }
 
-_bllua_ts.echo('  Executed bllua-env-safe.lua')
+print = _bllua_ts.echo
+print('  Executed bllua-env-safe.lua')

src/lua-env.lua

@@ -18,6 +18,8 @@ end
 
 -- Called when pcall fails on a ts->lua call, used to print detailed error info
 function _bllua_on_error(err)
+  -- Convert error to string if it's not already
+  err = tostring(err)
   err = err:match(': (.+)$') or err
   local tracelines = { err }
   local level = 2
@@ -25,7 +27,7 @@ function _bllua_on_error(err)
     local info = debug.getinfo(level)
     if not info then break end
     local filename = debug.getfilename(level) or info.short_src
-    local funcname = info.name
+    local funcname = info.name or '<unknown>'
     if funcname == 'dofile' then break end
     table.insert(tracelines, string.format('%s:%s in function \'%s\'',
       filename,
@@ -37,4 +39,9 @@ function _bllua_on_error(err)
   return table.concat(tracelines, '\n')
 end
 
-_bllua_ts.echo('  Executed bllua-env.lua')
+-- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE)
+_bllua_io_open = io.open
+_bllua_requiresecure = require
+
+print = _bllua_ts.echo
+print('  Executed bllua-env.lua')

src/luainterp.cpp

@@ -5,6 +5,7 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include <cstring>
+
 int bll_error_handler(lua_State* L) {
   lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error");
   if (!lua_isfunction(L, -1)) {
@@ -20,6 +21,7 @@ int bll_error_handler(lua_State *L) {
   lua_pcall(L, 1, 1, 0);
   return 1;
 }
+
 int bll_pcall(lua_State* L, int nargs, int nret) {
   // calculate stack position for message handler
   int hpos = lua_gettop(L) - nargs;
@@ -54,6 +56,7 @@ bool bll_LuaEval(lua_State *L, const char *str) {
 // Convert a Lua stack entry into a string for providing to TS
 // Use static buffer to avoid excessive malloc
 char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
+
 bool bll_toarg(lua_State* L, char* buf, int i, bool err) {
   if (lua_isstring(L, i)) {
     const char* str = lua_tostring(L, i);

src/luainterp.hpp

@@ -3,6 +3,7 @@
 #define _H_LUAINTERP_SHARED
 
 #include "lua.h"
+
 #define BLL_ARG_COUNT 20
 #define BLL_ARG_MAX 8192
 

src/lualibts.cpp

@@ -8,8 +8,8 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include "luainterp.hpp"
-int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
+
-               int ofs) {
+int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) {
   ADDR obj = (ADDR)NULL;
   if (oname) {
     obj = BlObject(oname);
@@ -55,71 +55,65 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
       res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]);
       break;
     case 7:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
-                      argv[5]);
       break;
     case 8:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
-                      argv[5], argv[6]);
       break;
     case 9:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
-                      argv[5], argv[6], argv[7]);
       break;
     case 10:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
-                      argv[5], argv[6], argv[7], argv[8]);
       break;
     case 11:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9]);
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
       break;
     case 12:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
+          argv[10]);
       break;
     case 13:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11]);
+          argv[10], argv[11]);
       break;
     case 14:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12]);
+          argv[10], argv[11], argv[12]);
       break;
     case 15:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12], argv[13]);
+          argv[10], argv[11], argv[12], argv[13]);
       break;
     case 16:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12], argv[13], argv[14]);
+          argv[10], argv[11], argv[12], argv[13], argv[14]);
       break;
     case 17:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12], argv[13], argv[14], argv[15]);
+          argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]);
       break;
     case 18:
-      res =
+      res = BlCallObj(
-          BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                    argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
-                    argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
       break;
     case 19:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12], argv[13], argv[14], argv[15],
+          argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
-                      argv[16], argv[17]);
       break;
     case 20:
-      res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
+      res = BlCallObj(
-                      argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
-                      argv[11], argv[12], argv[13], argv[14], argv[15],
+          argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
-                      argv[16], argv[17], argv[18]);
       break;
     default:
       res = "";
@@ -149,64 +143,60 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
       res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
       break;
     case 7:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
-                   argv[6]);
       break;
     case 8:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
-                   argv[6], argv[7]);
       break;
     case 9:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
-                   argv[6], argv[7], argv[8]);
       break;
     case 10:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
-                   argv[6], argv[7], argv[8], argv[9]);
       break;
     case 11:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10]);
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
       break;
     case 12:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+          argv[11]);
       break;
     case 13:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12]);
+          argv[11], argv[12]);
       break;
     case 14:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13]);
+          argv[11], argv[12], argv[13]);
       break;
     case 15:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13], argv[14]);
+          argv[11], argv[12], argv[13], argv[14]);
       break;
     case 16:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13], argv[14], argv[15]);
+          argv[11], argv[12], argv[13], argv[14], argv[15]);
       break;
     case 17:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13], argv[14], argv[15], argv[16]);
+          argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
       break;
     case 18:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
+          argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
       break;
     case 19:
-      res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+      res = BlCall(
-                   argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
+          fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
-                   argv[12], argv[13], argv[14], argv[15], argv[16], argv[17],
+          argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
-                   argv[18]);
       break;
     default:
       res = "";
@@ -218,6 +208,7 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
 
   return 1;
 }
+
 // Lua lib function: ts.call
 int bll_lua_tscall(lua_State* L) {
   int argc = lua_gettop(L) - 1; // number of arguments after function name
@@ -228,13 +219,12 @@ int bll_lua_tscall(lua_State *L) {
 
   return bll_TsCall(L, NULL, fname, argc, 1);
 }
+
 // Lua lib function: ts.callobj
 int bll_lua_tscallobj(lua_State* L) {
-  int argc =
+  int argc = lua_gettop(L) - 2; // number of arguments after function name and object?
-      lua_gettop(L) - 2; // number of arguments after function name and object?
   if (argc < 0)
-    return luaL_error(
+    return luaL_error(L, "_bllua_ts.callobj: Must provide an object and function name");
-        L, "_bllua_ts.callobj: Must provide an object and function name");
 
   const char* oname = luaL_checkstring(L, 1);
   const char* fname = luaL_checkstring(L, 2);
@@ -264,6 +254,7 @@ int bll_lua_tsgetfield(lua_State *L) {
   lua_pushstring(L, val);
   return 1;
 }
+
 // Lua lib function: ts.setfield
 int bll_lua_tssetfield(lua_State* L) {
   const char* oname = luaL_checkstring(L, 1);
@@ -300,4 +291,5 @@ const luaL_Reg bll_lua_reg[] = {
     {"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval},
     {"echo", bll_lua_tsecho},         {NULL, NULL},
 };
+
 void llibbl_init(lua_State* L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }

src/tsliblua.cpp

@@ -4,6 +4,7 @@
 #include "BlFuncs.hpp"
 #include "BlHooks.hpp"
 #include "luainterp.hpp"
+
 bool bll_LuaCall(const char* fname, int argc, const char* argv[]) {
   lua_getglobal(gL, fname);
   for (int i = 0; i < argc; i++) {

src/util/libbl-support.cs

@@ -42,4 +42,26 @@ package _bllua_objectDeletionHook {
 };
 activatePackage(_bllua_objectDeletionHook);
 
+// Public Lua library for TS
+function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
+}
+function luaexec(%fn) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_exec", %fn);
+}
+function luaeval(%code) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_eval", %code);
+}
+function luaget(%name) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_getvar", %name);
+}
+function luaset(%name, %val) {
+	if($_bllua_active)
+		_bllua_luacall("_bllua_setvar", %name, %val);
+}
+
 echo("  Executed libbl-support.cs");

src/util/libbl.lua

@@ -2,23 +2,39 @@
 -- Main lua-side functionality of bllua,
 -- provided through the global table 'bl.'
 
--- todo: set
-
 local _bllua_ts = ts
 
 bl = bl or {}
 
+-- Config
+local tsMaxArgs = 16
+local tsArgsLocal = '%a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p'
+local tsArgsGlobal =
+    '$_bllua_hook_arg1,$_bllua_hook_arg2,$_bllua_hook_arg3,$_bllua_hook_arg4,' ..
+    '$_bllua_hook_arg5,$_bllua_hook_arg6,$_bllua_hook_arg7,$_bllua_hook_arg8,' ..
+    '$_bllua_hook_arg9,$_bllua_hook_arg10,$_bllua_hook_arg11,$_bllua_hook_arg12,' ..
+    '$_bllua_hook_arg13,$_bllua_hook_arg14,$_bllua_hook_arg15,$_bllua_hook_arg16'
+
 -- Misc
--- Apply a function to each element in a list, building a new list from the returns
+local function ipairsNilable(t)
-local function map(t, f)
+  local maxk = 0
-  local u = {}
+  for k, _ in pairs(t) do
-  for i, v in ipairs(t) do
+    if k > maxk then maxk = k end
-    u[i] = f(v)
   end
-  return u
+  local i = 0
+  return function()
+    i = i + 1
+    if i > maxk then
+      return nil
+    else
+      return i, t[i]
     end
+  end
+end
+
+-- Validation
 local function isValidFuncName(name)
-  return type(name) == 'string' and name:find('^[a-zA-Z0-9_]+$')
+  return type(name) == 'string' and name:find('^[a-zA-Z_][a-zA-Z0-9_]*$')
 end
 local function isValidFuncNameNs(name)
   return type(name) == 'string' and (
@@ -76,7 +92,7 @@ for k, v in pairs(tsTypesByName) do
   tsTypesByNum[v] = k
 end
 
--- Type conversion
+-- Type conversion from Lua to TS
 local toTsObject
 -- Convert a string from TS into a boolean
 -- Note: Nonempty nonnumeric strings evaluate to 1, unlike in TS
@@ -100,36 +116,84 @@ local function valToTs(val)
       -- box - > 6 numbers
       return table.concat(val[1], ' ') .. ' ' .. table.concat(val[2], ' ')
     else
-      error('valToTs: could not convert table', 3)
+      error('valToTs: cannot pass Lua tables to TorqueScript.', 3)
     end
   else
-    error('valToTs: could not convert ' .. type(val), 3)
+    error('valToTs: could not convert value to TorqueScript: ' .. tostring(val), 3)
   end
 end
+
+-- Type conversion from TS to Lua
 local fromTsForceTypes = {
-  ['boolean'] = tsBool,
+  ['boolean'] = function(val) return tsBool(val) end,
-  ['object'] = function(val) toTsObject(val) end, -- toTsObject not defined yet
+  ['object'] = function(val) return toTsObject(val) end, -- wrap because toTsObject not defined yet
-  ['string'] = tostring,
+  ['string'] = function(val) return val end,
 }
-local function convertValFromTs(val, typ)
+local function forceValFromTs(val, typ)
-  return fromTsForceTypes[typ](val) or
+  local func = fromTsForceTypes[typ]
-      error('valFromTs: invalid force type ' .. typ, 4)
+  if not func then error('valFromTs: invalid force type \'' .. typ .. '\'', 4) end
+  return func(val)
+end
+local function vectorFromTs(val)
+  local xS, yS, zS = val:match('^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+  if xS then
+    return vector { tonumber(xS), tonumber(yS), tonumber(zS) }
+  else
+    return nil
+  end
+end
+local function boxFromTs(val)
+  local x1S, y1S, z1S, x2S, y2S, z2S = val:match(
+    '^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) ' ..
+    '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+  if x1S then
+    return {
+      vector { tonumber(x1S), tonumber(y1S), tonumber(z1S) },
+      vector { tonumber(x2S), tonumber(y2S), tonumber(z2S) } }
+  else
+    return nil
+  end
+end
+local function multinumericFromTs(val)
+  local tsNumPat = '%-?[0-9]+%.?[0-9]*e?[0-9]*'
+  if val:find('^' .. tsNumPat) then
+    local nums = {}
+    for _, part in ipairs(val:split(' ')) do
+      if part:find('^' .. tsNumPat .. '$') then
+        table.insert(nums, tonumber(part))
+      else
+        return nil
+      end
+    end
+    if #nums == 2 or #nums == 3 then
+      return vector(nums)
+    elseif #nums == 6 then -- box
+      return {
+        vector { nums[1], nums[2], nums[3] },
+        vector { nums[4], nums[5], nums[6] } }
+    elseif #nums == 7 then -- axis
+      return nil       --return matrix(nums)
+    else
+      return nil
+    end
+  end
 end
 bl._forceType = bl._forceType or {}
-local function valFromTs(val, name, name2) -- todo: ensure name and name2 are already lowercase
+-- todo: ensure name and name2 are already lowercase
+local function valFromTs(val, name, name2)
   if type(val) ~= 'string' then
     error('valFromTs: expected string, got ' .. type(val), 3)
   end
   if name then
     name = name:lower()
     if bl._forceType[name] then
-      return convertValFromTs(val, bl._forceType[name])
+      return forceValFromTs(val, bl._forceType[name])
     end
   end
   if name2 then
     name2 = name2:lower()
     if bl._forceType[name2] then
-      return convertValFromTs(val, bl._forceType[name2])
+      return forceValFromTs(val, bl._forceType[name2])
     end
   end
   -- '' -> nil
@@ -137,30 +201,29 @@ local function valFromTs(val, name, name2) -- todo: ensure name and name2 are al
   -- number
   local num = tonumber(val)
   if num then return num end
-  -- vector
+  -- vector, box, or axis->matrix
-  local xS, yS, zS = val:match('^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+  local vec = multinumericFromTs(val)
-  if xS then return vector { tonumber(xS), tonumber(yS), tonumber(zS) } end
+  if vec then return vec end
-  local x1S, y1S, z1S, x2S, y2S, z2S = val:match(
+  -- net string
-    '^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) ' ..
+  if val:sub(1, 1) == '\001' then
-    '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+    return _bllua_ts.call('getTaggedString', val)
-  -- box (2 vectors)
-  if x1S then
-    return {
-      vector { tonumber(x1S), tonumber(y1S), tonumber(z1S) },
-      vector { tonumber(x2S), tonumber(y2S), tonumber(z2S) } }
   end
   -- string
   return val
 end
 local function arglistFromTs(name, argsS)
   local args = {}
-  for i, arg in ipairs(argsS) do
+  for i, arg in ipairsNilable(argsS) do
     args[i] = valFromTs(arg, name .. ':' .. i)
   end
   return args
 end
 local function arglistToTs(args)
-  return map(args, valToTs)
+  local argsS = {}
+  for i, v in ipairsNilable(args) do
+    table.insert(argsS, valToTs(v))
+  end
+  return argsS
 end
 local function classFromForceTypeStr(name)
   local class, rest = name:match('^([a-zA-Z0-9_]+)(::.+)$')
@@ -195,13 +258,33 @@ setForceType = function(ftname, typ)
 end
 bl.type = setForceType
 
+-- Type conversion TS->Lua backwards, convert back to string
+local function numFromTsTostring(val)
+  -- todo: as-good-as-possible scientific notation for numbers
+  return tostring(val)
+end
+local function valFromTsTostring(val)
+  if type(val) == 'string' then
+    return val
+  elseif type(val) == 'number' then
+    return numFromTsTostring(val)
+  elseif type(val) == 'table' then
+    if val.__is_vector then
+      local strs = {}
+      for i = 1, #val do strs[i] = numFromTsTostring(val[i]) end
+      return table.concat(strs, ' ')
+    elseif val.__is_matrix then
+      -- todo: matrix back to axis-angle string
+      error('bl.string: matrix not yet supported', 3)
+    end
+  end
+  error('bl.string: cannot convert \'' .. type(val) .. '\'', 3)
+end
 
--- Value detection
+-- Getting info from TS about functions and objects
-
 local function isTsObject(t)
   return type(t) == 'table' and t._tsObjectId ~= nil
 end
-
 local function tsIsObject(name) return tsBool(_bllua_ts.call('isObject', name)) end
 local function tsIsFunction(name) return tsBool(_bllua_ts.call('isFunction', name)) end
 local function tsIsFunctionNs(ns, name) return tsBool(_bllua_ts.call('isFunction', ns, name)) end
@@ -213,30 +296,33 @@ local function tsIsFunctionNsname(nsname)
     return tsIsFunction(nsname)
   end
 end
-
+-- sanity check to make sure objects that don't isObject are always marked as ._deleted
+-- can be removed later
+local function assertTsObjectExists(obj)
+  local is = tsIsObject(obj._tsObjectId)
+  if not is then
+    print('Warning: TS object :exists or isobject from lua but no longer exists')
+  end
+  return is
+end
 function bl.isObject(obj)
-  if isTsObject(obj) then
+  if type(obj) == 'number' then  -- object id
-    obj = obj._tsObjectId
+    return tsIsObject(tostring(obj))
-  elseif type(obj) == 'number' then
+  elseif type(obj) == 'string' then -- object name
-    obj = tostring(obj)
+    return tsIsObject(obj)
-  elseif type(obj) ~= 'string' then
+  elseif isTsObject(obj) then    -- lua object
+    if obj._deleted then
+      return false
+    else
+      return assertTsObjectExists(obj)
+    end
+  else
     error('bl.isObject: argument #1: expected torque object, number, or string', 2)
   end
-  return tsIsObject(obj)
 end
 
-function bl.isFunction(a1, a2)
+function bl.isFunction(name)
-  if type(a1) ~= 'string' then
+  return tsIsFunctionNsname(name)
-    error('bl.isFunction: argument #1: expected string', 2)
-  end
-  if a2 then
-    if type(a2) ~= 'string' then
-      error('bl.isFunction: argument #2: expected string', 2)
-    end
-    return tsIsFunctionNs(a1, a2)
-  else
-    return tsIsFunction(a1)
-  end
 end
 
 -- Torque object pseudo-class
@@ -328,17 +414,20 @@ local tsObjectMeta = {
           tsIsFunctionNs(rawget(t, '_tsNamespace'), name) or
           tsIsFunctionNs(rawget(t, '_tsName'), name)
       then
-        return function(t, ...)
+        return function(t2, ...)
-          local args = { ... }
+          if t2 == nil or type(t2) ~= 'table' or not t2._tsObjectId then
-          local argsS = arglistToTs(args)
+            error('ts object method: be sure to use :func() not .func()', 2)
-          return valFromTs(
+          end
-            _bllua_ts.callobj(rawget(t, '_tsObjectId'), name, unpack(argsS)),
+          local argsS = arglistToTs({ ... })
-            rawget(t, '_tsName') and rawget(t, '_tsName') .. '::' .. name,
+          local res =
-            rawget(t, '_tsNamespace') .. '::' .. name)
+              _bllua_ts.callobj(t2._tsObjectId, name, unpack(argsS))
+          return valFromTs(res,
+            t2._tsName and t2._tsName .. '::' .. name,
+            t2._tsNamespace .. '::' .. name)
         end
       else
-        return valFromTs(
+        local res = _bllua_ts.getfield(rawget(t, '_tsObjectId'), name)
-          _bllua_ts.getfield(rawget(t, '_tsObjectId'), name),
+        return valFromTs(res,
           rawget(t, '_tsName') and rawget(t, '_tsName') .. '.' .. name,
           rawget(t, '_tsNamespace') .. '.' .. name)
       end
@@ -376,7 +465,8 @@ local tsObjectMeta = {
   -- Display a nice info string
   __tostring = function(t)
     return 'torque:' .. t._tsNamespace .. ':' .. t._tsObjectId ..
-        (t._tsName ~= '' and ('(' .. t._tsName .. ')') or '')
+        (t._tsName ~= '' and ('(' .. t._tsName .. ')') or '') ..
+        (t._deleted and '(deleted)' or '')
   end,
   -- #object
   -- If the object has a getCount method, return its count
@@ -412,7 +502,8 @@ local tsObjectMeta = {
         local obj = toTsObject(_bllua_ts.callobj(t._tsObjectId,
           'getObject', tostring(idx)))
         idx = idx + 1
-        return idx - 1, obj
+        --return idx-1, obj
+        return obj
       else
         return nil
       end
@@ -469,8 +560,9 @@ local tsObjectMeta = {
     end
     if t._deleted then
       return false
+    else
+      return assertTsObjectExists(t)
     end
-    return tsIsObject(t._tsObjectId)
   end,
 }
 -- Weak-values table for caching Torque object references
@@ -504,7 +596,7 @@ toTsObject = function(idiS)
   idiS = idiS:lower()
   if bl._objectsWeak[idiS] then return bl._objectsWeak[idiS] end
 
-  if not tsBool(_bllua_ts.call('isObject', idiS)) then
+  if not tsIsObject(idiS) then
     --error('toTsObject: object \''..idiS..'\' does not exist', 2) end
     return nil
   end
@@ -527,14 +619,13 @@ end
 local function safeNamespaceName(name)
   return tostring(name:gsub(':', '_'))
 end
-local nscallArgStr = '%a,%b,%c,%d,%e,%f,%g,%h'
 bl._cachedNamespaceCalls = {}
 local function tsNamespacedCallTfname(name)
   local tfname = bl._cachedNamespaceCalls[name]
   if not tfname then
     tfname = '_bllua_nscall_' .. safeNamespaceName(name)
-    local tfcode = 'function ' .. tfname .. '(' .. nscallArgStr .. '){' ..
+    local tfcode = 'function ' .. tfname .. '(' .. tsArgsLocal .. '){' ..
-        name .. '(' .. nscallArgStr .. ');}'
+        name .. '(' .. tsArgsLocal .. ');}'
     _bllua_ts.eval(tfcode)
     bl._cachedNamespaceCalls[name] = tfname
   end
@@ -542,9 +633,9 @@ local function tsNamespacedCallTfname(name)
 end
 local function tsCallGen(name)
   return function(...)
-    local args = { ... }
+    local argsS = arglistToTs({ ... })
-    local argsS = arglistToTs(args)
+    local res = _bllua_ts.call(name, unpack(argsS))
-    return valFromTs(_bllua_ts.call(name, unpack(argsS)), name)
+    return valFromTs(res, name)
   end
 end
 
@@ -570,14 +661,16 @@ local tsMeta = {
         if not rest:find('::') and tsIsFunctionNs(ns, rest) then
           return tsCallGen(tsNamespacedCallTfname(name))
         else
-          return valFromTs(_bllua_ts.getvar(name), name)
+          local res = _bllua_ts.getvar(name)
+          return valFromTs(res, name)
         end
       elseif tsIsFunction(name) then
         return tsCallGen(name)
       elseif tsIsObject(name) then
         return toTsObject(name)
       else
-        return valFromTs(_bllua_ts.getvar(name), name)
+        local res = _bllua_ts.getvar(name)
+        return valFromTs(res, name)
       end
     end
   end,
@@ -597,11 +690,18 @@ function bl.call(func, ...)
 end
 
 function bl.eval(code)
-  return valFromTs(_bllua_ts.eval(code))
+  local res = _bllua_ts.eval(code)
+  return valFromTs(res)
 end
 
 function bl.exec(file)
-  return valFromTs(_bllua_ts.call('exec', file))
+  local res = _bllua_ts.call('exec', file)
+  return valFromTs(res)
+end
+
+function bl.array(name, ...)
+  local rest = { ... }
+  return name .. table.concat(rest, '_')
 end
 
 function bl.boolean(val)
@@ -622,21 +722,77 @@ function bl.object(id)
   end
 end
 
-function bl.array(name, ...)
+function bl.string(val)
-  local rest = { ... }
+  return valFromTsTostring(val)
-  return name .. table.concat(rest, '_')
 end
 
-function _bllua_call(fnameS, ...)
+-- Lua calling from TS
-  local args = arglistFromTs('lua:' .. fnameS:lower(), { ... }) -- todo: allow this though bl.type
+local luaLookup
-  if not _G[fnameS] then
+luaLookup = function(tbl, name, set, val)
-    error('luacall: no global lua function named \'' .. fnameS .. '\'')
+  if name:find('%.') then
+    local first, rest = name:match('^([^%.:]+)%.(.+)$')
+    if not isValidFuncName(first) then
+      error('luaLookup: invalid name \'' .. tostring(first) .. '\'', 3)
     end
-  -- todo: library fields and object methods
+    if tbl[first] == nil then
-  local res = _G[fnameS](unpack(args))
+      if set then
+        tbl[first] = {}
+      else
+        return nil
+      end
+    end
+    return luaLookup(tbl[first], rest, set, val)
+  elseif name:find(':') then
+    local first, rest = name:match('^([^%.:]+):(.*)$')
+    if rest:find('[%.:]') then
+      error('luacall: cannot have : or . after :', 3)
+    end
+    if not isValidFuncName(first) then
+      error('luacall: invalid name \'' .. tostring(first) .. '\'', 3)
+    end
+    if not isValidFuncName(rest) then
+      error('luacall: invalid method name \'' .. tostring(first) .. '\'', 3)
+    end
+    if not tbl[first] then
+      error('luacall: no object named \'' .. rest .. '\'', 3)
+    end
+    if tbl[first][rest] == nil then
+      error('luacall: no method named \'' .. rest .. '\'', 3)
+    end
+    return function(...)
+      tbl[first][rest](tbl[first], ...)
+    end
+  else
+    if set then
+      tbl[name] = val
+    else
+      return tbl[name]
+    end
+  end
+end
+-- Todo: similar deep access for luaget and luaset
+function _bllua_call(fname, ...)
+  local args = arglistFromTs(fname:lower(), { ... }) -- todo: separate lua from ts func names?
+  local func = luaLookup(_G, fname)
+  if not func then
+    error('luacall: no global in lua named \'' .. fname .. '\'', 2)
+  end
+  local res = func(unpack(args))
   return valToTs(res)
 end
 
+function _bllua_getvar(vname)
+  return valToTs(luaLookup(_G, vname))
+end
+
+function _bllua_setvar(vname, valS)
+  return valToTs(luaLookup(_G, vname, true, valFromTs(valS, vname))) -- todo: separate lua from ts var names?
+end
+
+function _bllua_eval(code) return loadstring(code)() end
+
+function _bllua_exec(fn) return dofile(fn, 2) end
+
 -- bl.schedule: Use TS's schedule function to schedule lua calls
 -- bl.schedule(time, function, args...)
 bl._scheduleTable  = bl._scheduleTable or {}
@@ -688,9 +844,8 @@ local function addCmd(cmd, func)
     error('addCmd: invalid function name \'' .. tostring(cmd) .. '\'')
   end
   bl._cmds[cmd] = func
-  local arglist = '%a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p'
+  _bllua_ts.eval('function ' .. cmd .. '(' .. tsArgsLocal .. '){' ..
-  _bllua_ts.eval('function ' .. cmd .. '(' .. arglist .. '){' ..
+    '_bllua_luacall(_bllua_process_cmd,"' .. cmd .. '",' .. tsArgsLocal .. ');}')
-    '_bllua_luacall(_bllua_process_cmd,"' .. cmd .. '",' .. arglist .. ');}')
 end
 function bl.addServerCmd(name, func)
   name = name:lower()
@@ -710,8 +865,9 @@ function bl.commandToServer(cmd, ...)
     unpack(arglistToTs({ ... })))
 end
 
-function bl.commandToClient(cmd, ...)
+function bl.commandToClient(client, cmd, ...)
   _bllua_ts.call('commandToClient',
+    valToTs(client),
     _bllua_ts.call('addTaggedString', cmd),
     unpack(arglistToTs({ ... })))
 end
@@ -741,10 +897,6 @@ local function deactivatePackage(pkg)
     _bllua_ts.call('deactivatePackage', pkg)
   end
 end
-local hookNargs = 8
-local hookArglistLocal = '%a,%b,%c,%d,%e,%f,%g,%h'
-local hookArglistGlobal =
-'$_bllua_hook_arg1,$_bllua_hook_arg2,$_bllua_hook_arg3,$_bllua_hook_arg4,$_bllua_hook_arg5,$_bllua_hook_arg6,$_bllua_hook_arg7,$_bllua_hook_arg8'
 bl._hooks = bl._hooks or {}
 function _bllua_process_hook_before(pkgS, nameS, ...)
   local args = arglistFromTs(nameS, { ... })
@@ -759,7 +911,7 @@ function _bllua_process_hook_before(pkgS, nameS, ...)
     _bllua_ts.setvar('_bllua_hook_abort', '1')
     _bllua_ts.setvar('_bllua_hook_return', valToTs(args._return))
   end
-  for i = 1, hookNargs do
+  for i = 1, tsMaxArgs do
     _bllua_ts.setvar('_bllua_hook_arg' .. i, valToTs(args[i]))
   end
 end
@@ -780,8 +932,8 @@ end
 local function updateHook(pkg, name, hk)
   local beforeCode = hk.before and
       ('_bllua_luacall("_bllua_process_hook_before","' .. pkg .. '","' .. name ..
-        '",' .. hookArglistLocal .. ');') or ''
+        '",' .. tsArgsLocal .. ');') or ''
-  local arglist = (hk.before and hookArglistGlobal or hookArglistLocal)
+  local arglist = (hk.before and tsArgsGlobal or tsArgsLocal)
   local parentCode =
       tsIsFunctionNsname(name) and -- only call parent if it exists
       (hk.before and
@@ -794,10 +946,11 @@ local function updateHook(pkg, name, hk)
         arglist .. ');') or ''
   local code =
       'package ' .. pkg .. '{' ..
-      'function ' .. name .. '(' .. hookArglistLocal .. '){' ..
+      'function ' .. name .. '(' .. tsArgsLocal .. '){' ..
       beforeCode .. parentCode .. afterCode ..
       '}' ..
       '};'
+  print('bl.hook eval output: [[' .. code .. ']]')
   _bllua_ts.eval(code)
 end
 function bl.hook(pkg, name, time, func)
@@ -829,10 +982,10 @@ function bl.unhook(pkg, name, time)
   if not isValidFuncName(pkg) then
     error('bl.unhook: argument #1: invalid package name \'' .. tostring(pkg) .. '\'', 2)
   end
-  if not isValidFuncNameNs(name) then
+  if name and not isValidFuncNameNs(name) then
     error('bl.unhook: argument #2: invalid function name \'' .. tostring(name) .. '\'', 2)
   end
-  if time ~= 'before' and time ~= 'after' then
+  if time and time ~= 'before' and time ~= 'after' then
     error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2)
   end
 
@@ -861,10 +1014,13 @@ function bl.unhook(pkg, name, time)
           error('bl.unhook: argument #3: time must be nil, \'before\', or \'after\'', 2)
         end
         bl._hooks[pkg][name][time] = nil
-        if tableEmpty(bl._hooks[pkg][name]) and tableEmpty(bl._hooks[pkg]) then
+        if tableEmpty(bl._hooks[pkg][name]) then
+          bl._hooks[pkg][name] = nil
+        end
+        if tableEmpty(bl._hooks[pkg]) then
           bl._hooks[pkg] = nil
-          deactivatePackage(pkg)
           updateHook(pkg, name, {})
+          deactivatePackage(pkg)
         else
           updateHook(pkg, name, bl._hooks[pkg][name])
         end
@@ -923,7 +1079,7 @@ function bl.raycast(start, stop, mask, ignores)
   local stopS = vecToTs(start)
   local maskS = maskToTs(mask)
   local ignoresS = {}
-  for _, v in ipairs(ignores) do
+  for _, v in ipairsNilable(ignores) do
     table.insert(ignoresS, objToTs(v))
   end
 
@@ -975,7 +1131,7 @@ end
 local maxTsArgLen = 8192
 local function valsToString(vals)
   local strs = {}
-  for i, v in ipairs(vals) do
+  for i, v in ipairsNilable(vals) do
     local tstr = table.tostring(v)
     if #tstr > maxTsArgLen then
       tstr = tostring(v)

src/util/libts-lua.lua

@@ -93,11 +93,15 @@ local allowed_zip_dirs = tflip {
 local function io_open_absolute(fn, mode)
   -- if file exists, use original mode
   local res, err = _bllua_io_open(fn, mode)
-  if res then return res end
+  if res then
+    return res
+  elseif err and not err:find('No such file or directory$') then
+    return nil, err
+  end
 
   -- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader
   local dir = fn:match('^[^/]+')
-  if not allowed_zip_dirs[dir:lower()] then return nil, 'File is not in one of the allowed directories' end
+  if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end
   local exist = _bllua_ts.call('isFile', fn) == '1'
   if not exist then return nil, err end
 
@@ -135,8 +139,8 @@ end
 
 ---@diagnostic disable-next-line: duplicate-set-field
 function io.lines(fn)
-  local fi, err, fn2 = io.open(fn, 'r', 2)
+  local fi, err, fn2 = io.open(fn, nil, 2)
-  if not fi then error('Error opening file \'' .. tostring(fn2) .. '\': ' .. tostring(err), 2) end
+  if not fi then error('Error opening file \'' .. fn2 .. '\': ' .. err, 2) end
   return fi:lines()
 end
 
@@ -156,7 +160,7 @@ function dofile(fn, errn)
   errn = errn or 1
 
   local fi, err, fn2 = io.open(fn, 'r', errn + 1)
-  if not fi then error('Error executing file \'' .. tostring(fn2) .. '\': ' .. tostring(err), errn + 1) end
+  if not fi then error('Error executing file \'' .. fn2 .. '\': ' .. err, errn + 1) end
 
   print('Executing ' .. fn2)
   local text = fi:read('*a')
@@ -204,15 +208,6 @@ function require(mod)
   return _bllua_requiresecure(mod)
 end
 
--- Exposure to TS
-function _bllua_getvar(name) return _G[name] end
-
-function _bllua_setvar(name, val) _G[name] = val end
-
-function _bllua_eval(code) return loadstring(code)() end
-
-function _bllua_exec(fn) return dofile(fn, 2) end
-
 local function isValidCode(code)
   local f, e = loadstring(code)
   return f ~= nil

src/util/libts-ts.cs

@@ -49,26 +49,4 @@ function _bllua_set_var(%name, %val) {
 	return "";
 }
 
-// Public Lua library for TS
-function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
-}
-function luaexec(%fn) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_exec", %fn);
-}
-function luaeval(%code) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_eval", %code);
-}
-function luaget(%name) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_getvar", %name);
-}
-function luaset(%name, %val) {
-	if($_bllua_active)
-		_bllua_luacall("_bllua_setvar", %name, %val);
-}
-
 echo("  Executed libts-ts.cs");

src/util/matrix.lua

@@ -0,0 +1,6 @@
+-- todo
+-- Matrix class with math operators
+
+
+
+print('  Executed matrix.lua')

src/util/std.lua

@@ -4,7 +4,7 @@
 -- Table / List
 -- Whether a table contains no keys
 function table.empty(t)
-  return next(t) ~= nil
+  return next(t) == nil
 end
 
 -- Apply a function to each key in a table
@@ -13,8 +13,19 @@ function table.map(f, ...)
   local u = {}
   for k, _ in pairs(ts[1]) do
     local args = {}
-    for j = 1, #ts do args[j] = ts[j][i] end
+    for j = 1, #ts do args[j] = ts[j][k] end
-    u[i] = f(unpack(args))
+    u[k] = f(unpack(args))
+  end
+  return u
+end
+
+function table.mapk(f, ...)
+  local ts = { ... }
+  local u = {}
+  for k, _ in pairs(ts[1]) do
+    local args = {}
+    for j = 1, #ts do args[j] = ts[j][k] end
+    u[k] = f(k, unpack(args))
   end
   return u
 end
@@ -30,6 +41,17 @@ function table.map_list(f, ...)
   return u
 end
 
+function table.mapi_list(f, ...)
+  local ts = { ... }
+  local u = {}
+  for i = 1, #ts[1] do
+    local args = {}
+    for j = 1, #ts do args[j] = ts[j][i] end
+    u[i] = f(i, unpack(args))
+  end
+  return u
+end
+
 -- Swap keys/values
 function table.swap(t)
   local u = {}
@@ -193,7 +215,7 @@ valueToString = function(v, tabLevel, seen)
     return tostring(v)
   else
     --error('table.tostring: table contains a '..t..' value, cannot serialize')
-    return 'nil --[[ cannot serialize ' .. t .. ': ' .. tostring(v) .. ' ]]'
+    return 'nil --[[ ' .. tostring(v) .. ' ]]'
   end
 end
 function table.tostring(t)
@@ -372,3 +394,5 @@ end
 function math.clamp(v, n, x)
   return math.min(x, math.max(v, n))
 end
+
+print('  Executed std.lua')

src/util/vector.lua

@@ -235,4 +235,7 @@ vector_new = function(vi)
 end
 
 vector = vector_new
+
+print('  Executed vector.lua')
+
 return vector_new