src/lua_hooklib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -22,6 +22,7 @@
 #include "lua_libs.h"
 #include "lua_hook.h"
 #include "lua_hud.h" // hud_running errors
+#include "lua_archive.h"
 
 #include "m_perfstats.h"
 #include "netcode/d_netcmd.h" // for cv_perfstats
@@ -375,6 +376,17 @@ static boolean prepare_string_hook
 		return false;
 }
 
+static boolean prepare_hud_hook
+(
+		Hook_State * hook,
+		int default_status,
+		int hook_type
+){
+	return init_hook_type(hook, default_status,
+			hook_type, 0, NULL,
+			hudHookIds[hook_type].numHooks);
+}
+
 static void init_hook_call
 (
 		Hook_State * hook,
@@ -487,7 +499,40 @@ static int call_string_hooks(Hook_State *hook)
 
 static int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
 {
-	return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
+	int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
+
+	if (numCalls > 0 && mobj_type == MT_NULL && (
+		   hook->hook_type == MOBJ_HOOK(MobjThinker    )
+		|| hook->hook_type == MOBJ_HOOK(MobjCollide    )
+		|| hook->hook_type == MOBJ_HOOK(MobjLineCollide)
+		|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
+		|| hook->hook_type == MOBJ_HOOK(MobjFuse       )
+		|| hook->hook_type == MOBJ_HOOK(MobjThinker    )
+		|| hook->hook_type == MOBJ_HOOK(BossThinker    )
+		|| hook->hook_type == MOBJ_HOOK(MobjMoveBlocked)
+		|| hook->hook_type == MOBJ_HOOK(FollowMobj     )
+	))
+		LUA_UsageWarning(L, va(
+			"%s hooks not attached to a specific mobj type are deprecated and will be removed.",
+			mobjHookNames[hook->hook_type])
+		);
+
+	return numCalls;
+}
+
+static void call_hud_hooks
+(
+		Hook_State * hook,
+		int        results,
+		Hook_Callback results_handler
+){
+	hud_running = true; // local hook
+	init_hook_call(hook, results, results_handler);
+	call_mapped(hook, &hudHookIds[hook->hook_type]);
+	hud_running = false;
+
+	lua_pushnil(gL);
+	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
 }
 
 static int call_hooks
@@ -646,27 +691,70 @@ int LUA_HookKey(event_t *event, int hook_type)
 	return hook.status;
 }
 
-void LUA_HookHUD(int hook_type, huddrawlist_h list)
+int LUA_HookText(event_t *event, int hook_type)
 {
-	const hook_t * map = &hudHookIds[hook_type];
 	Hook_State hook;
-	if (map->numHooks > 0)
+	if (prepare_hook(&hook, false, hook_type))
 	{
-		start_hook_stack();
-		begin_hook_values(&hook);
+		LUA_PushUserdata(gL, event, META_TEXTEVENT);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
 
+void LUA_HookHUD(int hook_type, huddrawlist_h list)
+{
+	Hook_State hook;
+	if (prepare_hud_hook(&hook, 0, hook_type))
+	{
 		LUA_SetHudHook(hook_type, list);
+		call_hud_hooks(&hook, 0, res_none);
+	}
+}
 
-		hud_running = true; // local hook
-		init_hook_call(&hook, 0, res_none);
-		call_mapped(&hook, map);
-		hud_running = false;
+int LUA_HookCharacterHUD
+(
+	int hook_type, huddrawlist_h list, player_t *player,
+	fixed_t x, fixed_t y, fixed_t scale,
+	INT32 skinIndex, UINT8 sprite2, UINT8 frame, UINT8 rotation, skincolornum_t color,
+	INT32 ticker, boolean mode
+){
+	Hook_State hook;
+	if (prepare_hud_hook(&hook, false, hook_type))
+	{
+		LUA_SetHudHook(hook_type, list);
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		lua_pushfixed(gL, x);
+		lua_pushfixed(gL, y);
+		lua_pushfixed(gL, scale);
+		lua_pushstring(gL, skins[skinIndex]->name);
+		lua_pushinteger(gL, sprite2);
+		lua_pushinteger(gL, frame);
+		lua_pushinteger(gL, rotation);
+		lua_pushinteger(gL, color);
+		lua_pushinteger(gL, ticker);
+		lua_pushboolean(gL, mode);
+		call_hud_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
 
-		lua_pushnil(gL);
-		lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
+boolean LUA_HookEscapePanel(int hook, huddrawlist_h drawlist, int x, int y, int width, int height)
+{
+	Hook_State hookstate;
+	if (prepare_hud_hook(&hookstate, false, hook))
+	{
+		LUA_SetHudHook(hook, drawlist);
+		lua_pushinteger(gL, x);
+		lua_pushinteger(gL, y);
+		lua_pushinteger(gL, width);
+		lua_pushinteger(gL, height);
+		call_hud_hooks(&hookstate, 1, res_true);
 	}
+	return hookstate.status;
 }
 
+
 /* =========================================================================
                                SPECIALIZED HOOKS
    ========================================================================= */
@@ -956,9 +1044,10 @@ void LUA_HookNetArchive(lua_CFunction archFunc)
 
 		begin_hook_values(&hook);
 
-		// tables becomes an upvalue of archFunc
-		lua_pushvalue(gL, -1);
-		lua_pushcclosure(gL, archFunc, 1);
+		// tables and userdata becomes an upvalue of archFunc
+		lua_pushvalue(gL, -2);
+		lua_pushvalue(gL, -2);
+		lua_pushcclosure(gL, archFunc, 2);
 		// stack: tables, archFunc
 
 		init_hook_call(&hook, 0, res_none);
@@ -1017,6 +1106,18 @@ void LUA_HookPlayerQuit(player_t *plr, kickreason_t reason)
 	}
 }
 
+int LUA_HookNameChange(player_t *plr, const char *name)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, true, HOOK(NameChange)))
+	{
+		LUA_PushUserdata(gL, plr, META_PLAYER); // Player that changed name
+		lua_pushstring(gL, name);   // New player name
+		call_hooks(&hook, 1, res_false);
+	}
+	return hook.status;
+}
+
 int LUA_HookTeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble)
 {
 	Hook_State hook;
@@ -1167,6 +1268,47 @@ int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)
 	return hook.status;
 }
 
+static void res_soundplay(Hook_State* hook)
+{
+    if (!lua_isnil(gL, -1))
+    {
+        UINT32 sfx_id = lua_tonumber(gL, -1);
+        if (lua_isboolean(gL, -1) && lua_toboolean(gL, -1))
+            hook->status = 0; //sfx_None if returning True
+
+        //Make sure number is in range
+        else if (!lua_isboolean(gL, -1)
+            && (sfx_id < NUMSFX))
+            hook->status = sfx_id;
+
+        if (sfx_id >= NUMSFX)
+			CONS_Alert(CONS_WARNING, "sfx %d out of range (0 - %d)\n", sfx_id, NUMSFX-1);
+    }
+}
+
+int LUA_HookSoundPlay(sfxenum_t sfx_id, void *origin, const int origintype)
+{
+    Hook_State hook;
+
+    if (prepare_hook(&hook, sfx_id, HOOK(SoundPlay)))
+    {
+        lua_pushinteger(gL, sfx_id);
+        if (origin != NULL)
+        {
+			if (origintype == 0)
+				LUA_PushUserdata(gL, (mobj_t*)origin, META_MOBJ);
+			else if (origintype == 1)
+				LUA_PushUserdata(gL, (sector_t*)origin, META_SECTOR);
+			lua_pushinteger(gL, origintype);
+        }
+
+        hud_running = true; // local hook
+        call_hooks(&hook, 1, res_soundplay);
+        hud_running = false;
+    }
+    return hook.status;
+}
+
 static void res_playerheight(Hook_State *hook)
 {
 	if (!lua_isnil(gL, -1))

src/lua_hud.h

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2023 by Sonic Team Junior.
+// Copyright (C) 2014-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -20,6 +20,10 @@ enum hud {
 	hud_textspectator,
 	hud_crosshair,
 	hud_powerups,
+	hud_gameover,
+	hud_pause,
+	hud_cecho,
+	hud_chat,
 	// Singleplayer / Co-op
 	hud_score,
 	hud_time,
@@ -30,6 +34,7 @@ enum hud {
 	hud_weaponrings,
 	hud_powerstones,
 	hud_teamscores,
+	hud_itemhunt,
 	// NiGHTS mode
 	hud_nightslink,
 	hud_nightsdrill,

src/lua_hudlib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2023 by Sonic Team Junior.
+// Copyright (C) 2014-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -42,6 +42,10 @@ static const char *const hud_disable_options[] = {
 	"textspectator",
 	"crosshair",
 	"powerups",
+	"gameover",
+	"pause",
+	"cecho",
+	"chat",
 
 	"score",
 	"time",
@@ -52,6 +56,7 @@ static const char *const hud_disable_options[] = {
 	"weaponrings",
 	"powerstones",
 	"teamscores",
+	"itemhunt",
 
 	"nightslink",
 	"nightsdrill",
@@ -461,15 +466,29 @@ static int camera_set(lua_State *L)
 
 static int libd_patchExists(lua_State *L)
 {
-	HUDONLY
 	lua_pushboolean(L, W_LumpExists(luaL_checkstring(L, 1)));
 	return 1;
 }
 
 static int libd_cachePatch(lua_State *L)
 {
-	HUDONLY
-	LUA_PushUserdata(L, W_CachePatchLongName(luaL_checkstring(L, 1), PU_PATCH), META_PATCH);
+	const char *name = luaL_checkstring(L, 1);
+	patch_t *patch = W_CachePatchLongName(name, PU_PATCH);
+
+#ifdef ROTSPRITE
+	if (lua_isnumber(L, 2))
+	{
+		angle_t rollangle = luaL_checkangle(L, 2);
+		INT32 rot = R_GetRollAngle(rollangle);
+		if (rot) {
+			patch_t *rotpatch = Patch_GetRotated(patch, rot, false);
+			LUA_PushUserdata(L, rotpatch, META_PATCH);
+			return 1;
+		}
+	}
+#endif
+	
+	LUA_PushUserdata(L, patch, META_PATCH);
 	return 1;
 }
 
@@ -481,7 +500,6 @@ static int libd_getSpritePatch(lua_State *L)
 	UINT8 angle = 0;
 	spritedef_t *sprdef;
 	spriteframe_t *sprframe;
-	HUDONLY
 
 	if (lua_isnumber(L, 1)) // sprite number given, e.g. SPR_THOK
 	{
@@ -492,9 +510,7 @@ static int libd_getSpritePatch(lua_State *L)
 	else if (lua_isstring(L, 1)) // sprite prefix name given, e.g. "THOK"
 	{
 		const char *name = lua_tostring(L, 1);
-		for (i = 0; i < NUMSPRITES; i++)
-			if (fastcmp(name, sprnames[i]))
-				break;
+		i = R_GetSpriteNumByName(name);
 		if (i >= NUMSPRITES)
 			return 0;
 	}
@@ -557,7 +573,6 @@ static int libd_getSprite2Patch(lua_State *L)
 	spritedef_t *sprdef;
 	spriteframe_t *sprframe;
 	boolean super = false; // add SPR2F_SUPER to sprite2 if true
-	HUDONLY
 
 	// get skin first!
 	if (lua_isnumber(L, 1)) // find skin by number
@@ -615,6 +630,10 @@ static int libd_getSprite2Patch(lua_State *L)
 	if (super)
 		j |= SPR2F_SUPER;
 
+	// If there is no "super" variation of this sprite, try with the normal one.
+	if (!P_IsValidSprite2(skins[i], j))
+		j &= ~SPR2F_SUPER;
+
 	sprdef = P_GetSkinSpritedef(skins[i], j);
 
 	// set frame number
@@ -873,6 +892,28 @@ static int libd_drawFill(lua_State *L)
 	return 0;
 }
 
+static int libd_drawFixedFill(lua_State *L)
+{
+	huddrawlist_h list;
+	INT32 x = luaL_optinteger(L, 1, 0);
+	INT32 y = luaL_optinteger(L, 2, 0);
+	INT32 w = luaL_optinteger(L, 3, BASEVIDWIDTH << FRACBITS);
+	INT32 h = luaL_optinteger(L, 4, BASEVIDHEIGHT << FRACBITS);
+	INT32 c = luaL_optinteger(L, 5, 31);
+
+	HUDONLY
+
+	lua_getfield(L, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
+	list = (huddrawlist_h) lua_touserdata(L, -1);
+	lua_pop(L, 1);
+
+	if (LUA_HUD_IsDrawListValid(list))
+		LUA_HUD_AddDrawFixedFill(list, x, y, w, h, c);
+	else
+		V_DrawFixedFill(x, y, w, h, c);
+	return 0;
+}
+
 static int libd_drawString(lua_State *L)
 {
 	huddrawlist_h list;
@@ -1128,13 +1169,12 @@ static int libd_levelTitleHeight(lua_State *L)
 
 static int libd_getColormap(lua_State *L)
 {
+	HUDONLY
 	INT32 skinnum = TC_DEFAULT;
 	skincolornum_t color = luaL_optinteger(L, 2, 0);
 	UINT8* colormap = NULL;
 	int translation_id = -1;
 
-	HUDONLY
-
 	if (lua_isnoneornil(L, 1))
 		; // defaults to TC_DEFAULT
 	else if (lua_type(L, 1) == LUA_TNUMBER) // skin number
@@ -1174,9 +1214,10 @@ static int libd_getColormap(lua_State *L)
 
 static int libd_getStringColormap(lua_State *L)
 {
+	HUDONLY
 	INT32 flags = luaL_checkinteger(L, 1);
 	UINT8* colormap = NULL;
-	HUDONLY
+
 	colormap = V_GetStringColormap(flags & V_CHARCOLORMASK);
 	if (colormap) {
 		LUA_PushUserdata(L, colormap, META_COLORMAP); // push as META_COLORMAP userdata, specifically for patches to use!
@@ -1187,6 +1228,7 @@ static int libd_getStringColormap(lua_State *L)
 
 static int libd_getSectorColormap(lua_State *L)
 {
+	HUDONLY
 	boolean has_sector = false;
 	sector_t *sector = NULL;
 	if (!lua_isnoneornil(L, 1))
@@ -1262,21 +1304,18 @@ static int libd_fadeScreen(lua_State *L)
 
 static int libd_width(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, vid.width); // push screen width
 	return 1;
 }
 
 static int libd_height(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, vid.height); // push screen height
 	return 1;
 }
 
 static int libd_dup(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, vid.dup); // push integral scale (patch scale)
 	lua_pushfixed(L, vid.fdup); // push fixed point scale (position scale)
 	return 2;
@@ -1284,7 +1323,6 @@ static int libd_dup(lua_State *L)
 
 static int libd_renderer(lua_State *L)
 {
-	HUDONLY
 	switch (rendermode) {
 		case render_opengl: lua_pushliteral(L, "opengl");   break; // OpenGL renderer
 		case render_soft:   lua_pushliteral(L, "software"); break; // Software renderer
@@ -1298,14 +1336,12 @@ static int libd_renderer(lua_State *L)
 
 static int libd_RandomFixed(lua_State *L)
 {
-	HUDONLY
 	lua_pushfixed(L, M_RandomFixed());
 	return 1;
 }
 
 static int libd_RandomByte(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, M_RandomByte());
 	return 1;
 }
@@ -1314,7 +1350,6 @@ static int libd_RandomKey(lua_State *L)
 {
 	INT32 a = (INT32)luaL_checkinteger(L, 1);
 
-	HUDONLY
 	lua_pushinteger(L, M_RandomKey(a));
 	return 1;
 }
@@ -1324,7 +1359,6 @@ static int libd_RandomRange(lua_State *L)
 	INT32 a = (INT32)luaL_checkinteger(L, 1);
 	INT32 b = (INT32)luaL_checkinteger(L, 2);
 
-	HUDONLY
 	lua_pushinteger(L, M_RandomRange(a, b));
 	return 1;
 }
@@ -1332,7 +1366,6 @@ static int libd_RandomRange(lua_State *L)
 // Macros.
 static int libd_SignedRandom(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, M_SignedRandom());
 	return 1;
 }
@@ -1340,7 +1373,6 @@ static int libd_SignedRandom(lua_State *L)
 static int libd_RandomChance(lua_State *L)
 {
 	fixed_t p = luaL_checkfixed(L, 1);
-	HUDONLY
 	lua_pushboolean(L, M_RandomChance(p));
 	return 1;
 }
@@ -1349,7 +1381,6 @@ static int libd_RandomChance(lua_State *L)
 // Could as well be thrown in global vars for ease of access but I guess it makes sense for it to be a HUD fn
 static int libd_getlocaltransflag(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, (10-st_translucency)*V_10TRANS);
 	return 1;
 }
@@ -1357,7 +1388,6 @@ static int libd_getlocaltransflag(lua_State *L)
 // Get cv_translucenthud's value for HUD rendering as a normal V_xxTRANS int
 static int libd_getusertransflag(lua_State *L)
 {
-	HUDONLY
 	lua_pushinteger(L, (10-cv_translucenthud.value)*V_10TRANS);	// A bit weird that it's called "translucenthud" yet 10 is fully opaque :V
 	return 1;
 }
@@ -1379,6 +1409,7 @@ static luaL_Reg lib_draw[] = {
 	{"drawNum", libd_drawNum},
 	{"drawPaddedNum", libd_drawPaddedNum},
 	{"drawFill", libd_drawFill},
+	{"drawFixedFill", libd_drawFixedFill},
 	{"drawString", libd_drawString},
 	{"drawNameTag", libd_drawNameTag},
 	{"drawScaledNameTag", libd_drawScaledNameTag},
@@ -1450,6 +1481,26 @@ static luaL_Reg lib_hud[] = {
 	{"disable", lib_huddisable},
 	{"enabled", lib_hudenabled},
 	{"add", lib_hudadd},
+	{"patchExists", libd_patchExists},
+	{"cachePatch", libd_cachePatch},
+	{"getSpritePatch", libd_getSpritePatch},
+	{"getSprite2Patch", libd_getSprite2Patch},
+	{"width", libd_width},
+	{"height", libd_height},
+	{"scale", libd_dup},
+	{"renderer", libd_renderer},
+	{NULL, NULL}
+};
+
+// globalized client_side random functions.
+static luaL_Reg lib_randomclient[] = {
+	// m_random
+	{"localFixed",libd_RandomFixed},
+	{"localByte",libd_RandomByte},
+	{"localKey",libd_RandomKey},
+	{"localRange",libd_RandomRange},
+	{"localSignedRandom",libd_SignedRandom}, // MACRO
+	{"localChance",libd_RandomChance}, // MACRO
 	{NULL, NULL}
 };
 
@@ -1476,6 +1527,7 @@ int LUA_HudLib(lua_State *L)
 	LUA_RegisterGlobalUserdata(L, "hudinfo", lib_getHudInfo, NULL, lib_hudinfolen);
 
 	luaL_register(L, "hud", lib_hud);
+	luaL_register(L, "random", lib_randomclient);
 	return 0;
 }
 

src/lua_hudlib_drawlist.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2023 by Sonic Team Junior.
+// Copyright (C) 2014-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -25,6 +25,7 @@ enum drawitem_e {
 	DI_DrawNum,
 	DI_DrawPaddedNum,
 	DI_DrawFill,
+	DI_DrawFixedFill,
 	DI_DrawString,
 	DI_DrawNameTag,
 	DI_DrawScaledNameTag,
@@ -180,7 +181,8 @@ static const char *CopyString(huddrawlist_h list, const char* str)
 		const char *old_offset = list->strbuf;
 		size_t i;
 		if (list->strbuf_capacity == 0) list->strbuf_capacity = 256;
-		else list->strbuf_capacity *= 2;
+		while (list->strbuf_capacity <= list->strbuf_len + lenstr + 1)
+			list->strbuf_capacity *= 2;
 		list->strbuf = (char*) Z_Realloc(list->strbuf, sizeof(char) * list->strbuf_capacity, PU_STATIC, NULL);
 
 		// align the string pointers to make sure old pointers don't point towards invalid addresses
@@ -345,6 +347,25 @@ void LUA_HUD_AddDrawFill(
 	item->c = c;
 }
 
+void LUA_HUD_AddDrawFixedFill(
+	huddrawlist_h list,
+	fixed_t x,
+	fixed_t y,
+	fixed_t w,
+	fixed_t h,
+	INT32 c
+)
+{
+	size_t i = AllocateDrawItem(list);
+	drawitem_t *item = &list->items[i];
+	item->type = DI_DrawFixedFill;
+	item->x = x;
+	item->y = y;
+	item->w = w;
+	item->h = h;
+	item->c = c;
+}
+
 void LUA_HUD_AddDrawString(
 	huddrawlist_h list,
 	fixed_t x,
@@ -481,6 +502,9 @@ void LUA_HUD_DrawList(huddrawlist_h list)
 			case DI_DrawFill:
 				V_DrawFill(item->x, item->y, item->w, item->h, item->c);
 				break;
+			case DI_DrawFixedFill:
+				V_DrawFixedFill(item->x, item->y, item->w, item->h, item->c);
+				break;
 			case DI_DrawString:
 				switch(item->align)
 				{

src/lua_hudlib_drawlist.h

@@ -98,6 +98,14 @@ void LUA_HUD_AddDrawFill(
 	INT32 h,
 	INT32 c
 );
+void LUA_HUD_AddDrawFixedFill(
+	huddrawlist_h list,
+	fixed_t x,
+	fixed_t y,
+	fixed_t w,
+	fixed_t h,
+	INT32 c
+);
 void LUA_HUD_AddDrawString(
 	huddrawlist_h list,
 	fixed_t x,

src/lua_infolib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2025 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -82,14 +83,14 @@ static int lib_getSprname(lua_State *L)
 		i = lua_tonumber(L, 1);
 		if (i > NUMSPRITES)
 			return 0;
-		lua_pushlstring(L, sprnames[i], 4);
+		lua_pushstring(L, sprnames[i]);
 		return 1;
 	}
 	else if (lua_isstring(L, 1))
 	{
 		const char *name = lua_tostring(L, 1);
-		for (i = 0; i < NUMSPRITES; i++)
-			if (fastcmp(name, sprnames[i]))
+		i = R_GetSpriteNumByName(name);
+		if (i != NUMSPRITES)
 		{
 			lua_pushinteger(L, i);
 			return 1;
@@ -236,31 +237,51 @@ static int lib_spr2namelen(lua_State *L)
 // SPRITE INFO //
 /////////////////
 
-// spriteinfo[]
-static int lib_getSpriteInfo(lua_State *L)
+struct SpriteInfoFrame {
+	spriteinfo_t *sprinfo;
+	UINT16 frame;
+};
+
+static UINT16 GetSpriteInfoFrameIndex(lua_State *L, int idx)
 {
-	UINT32 i = NUMSPRITES;
-	lua_remove(L, 1);
+	if (lua_type(L, idx) == LUA_TSTRING)
+	{
+		const char *field = luaL_checkstring(L, idx);
 
-	if (lua_isstring(L, 1))
+		if (fastcmp("default", field))
 		{
-		const char *name = lua_tostring(L, 1);
-		INT32 spr;
-		for (spr = 0; spr < NUMSPRITES; spr++)
+			return SPRINFO_DEFAULT_FRAME;
+		}
+		else
 		{
-			if (fastcmp(name, sprnames[spr]))
+			UINT8 frame = R_Char2Frame(field[0]);
+			if (frame == 255)
+				return luaL_error(L, "invalid frame %s", field);
+			return (UINT16)frame;
+		}
+	}
+	else
 	{
-				i = spr;
-				break;
+		int frameID = luaL_checknumber(L, idx);
+		if (frameID < 0 || frameID >= MAXFRAMENUM)
+			return luaL_error(L, "frame %d out of range (0 - %d)", frameID, MAXFRAMENUM - 1);
+		return (UINT16)frameID;
 	}
 }
-		if (i == NUMSPRITES)
+
+// spriteinfo[]
+static int lib_getSpriteInfo(lua_State *L)
 {
-			char *check;
-			i = strtol(name, &check, 10);
-			if (check == name || *check != '\0')
+	UINT32 i = NUMSPRITES;
+	lua_remove(L, 1);
+
+	if (lua_type(L, 1) == LUA_TSTRING)
+	{
+		const char *name = lua_tostring(L, 1);
+		INT32 spr = R_GetSpriteNumByName(name);
+		if (spr == NUMSPRITES)
 			return luaL_error(L, "unknown sprite name %s", name);
-		}
+		i = spr;
 	}
 	else
 		i = luaL_checkinteger(L, 1);
@@ -275,9 +296,72 @@ static int lib_getSpriteInfo(lua_State *L)
 #define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to spriteinfo[] (%s)", e);
 #define TYPEERROR(f, t1, t2) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t1), lua_typename(L, t2)))
 
-static int PopPivotSubTable(spriteframepivot_t *pivot, lua_State *L, int stk, int idx)
+static int PopPivotSubTable(spriteinfoframe_t *frame, lua_State *L, int stk);
+
+static int PopFrameSubTable(spriteinfoframe_t *frame, lua_State *L, int stk)
 {
 	int okcool = 0;
+
+	switch (lua_type(L, stk))
+	{
+	case LUA_TTABLE:
+		lua_pushnil(L);
+		while (lua_next(L, stk))
+		{
+			const char *key = luaL_checkstring(L, stk+1);
+			if (fastcmp(key, "pivot"))
+			{
+				if (PopPivotSubTable(frame, L, stk+2))
+					okcool = 1;
+			}
+			else
+			{
+				FIELDERROR("sprite info frame key", va("invalid option %s", key));
+			}
+
+			okcool = 1;
+
+			lua_pop(L, 1);
+		}
+		break;
+	default:
+		TYPEERROR("sprite info frame", LUA_TTABLE, lua_type(L, stk))
+	}
+
+	return okcool;
+}
+
+static int PopFrameTable(spriteinfo_t *info, lua_State *L, int stk)
+{
+	lua_pushnil(L);
+
+	while (lua_next(L, stk))
+	{
+		int idx = 0;
+		switch (lua_type(L, stk+1))
+		{
+		case LUA_TSTRING:
+		case LUA_TNUMBER:
+			idx = GetSpriteInfoFrameIndex(L, stk+1);
+			break;
+		default:
+			TYPEERROR("sprite info frame", LUA_TNUMBER, lua_type(L, stk+1));
+		}
+
+		// the values in frames[] are also tables
+		if (PopFrameSubTable(&info->frames[idx], L, stk+2))
+			set_bit_array(info->available, idx);
+
+		lua_pop(L, 1);
+	}
+
+	return 0;
+}
+
+static int PopPivotSubTable(spriteinfoframe_t *frame, lua_State *L, int stk)
+{
+	int okcool = 0;
+
 	switch (lua_type(L, stk))
 	{
 	case LUA_TTABLE:
@@ -287,6 +371,7 @@ static int PopPivotSubTable(spriteframepivot_t *pivot, lua_State *L, int stk, in
 			const char *key = NULL;
 			lua_Integer ikey = -1;
 			lua_Integer value = 0;
+
 			// x or y?
 			switch (lua_type(L, stk+1))
 			{
@@ -299,6 +384,7 @@ static int PopPivotSubTable(spriteframepivot_t *pivot, lua_State *L, int stk, in
 			default:
 				FIELDERROR("pivot key", va("string or number expected, got %s", luaL_typename(L, stk+1)))
 			}
+
 			// then get value
 			switch (lua_type(L, stk+2))
 			{
@@ -311,59 +397,60 @@ static int PopPivotSubTable(spriteframepivot_t *pivot, lua_State *L, int stk, in
 			default:
 				TYPEERROR("pivot value", LUA_TNUMBER, lua_type(L, stk+2))
 			}
-				// finally set omg!!!!!!!!!!!!!!!!!!
+
+			// Set it
 			if (ikey == 1 || (key && fastcmp(key, "x")))
-					pivot[idx].x = (INT32)value;
+				frame->pivot.x = (INT32)value;
 			else if (ikey == 2 || (key && fastcmp(key, "y")))
-					pivot[idx].y = (INT32)value;
+				frame->pivot.y = (INT32)value;
 			// TODO: 2.3: Delete
 			else if (ikey == 3 || (key && fastcmp(key, "rotaxis")))
 				LUA_UsageWarning(L, "\"rotaxis\" is deprecated and will be removed.")
 			else if (ikey == -1 && (key != NULL))
 				FIELDERROR("pivot key", va("invalid option %s", key));
+
 			okcool = 1;
+
 			lua_pop(L, 1);
 		}
 		break;
 	default:
 		TYPEERROR("sprite pivot", LUA_TTABLE, lua_type(L, stk))
 	}
+
+	if (okcool)
+		frame->pivot.available = true;
+
 	return okcool;
 }
 
 static int PopPivotTable(spriteinfo_t *info, lua_State *L, int stk)
 {
-	// Just in case?
-	if (!lua_istable(L, stk))
-		TYPEERROR("pivot table", LUA_TTABLE, lua_type(L, stk));
-
 	lua_pushnil(L);
-	// stk = 0 has the pivot table
-	// stk = 1 has the frame key
-	// stk = 2 has the frame table
-	// stk = 3 has either a string or a number as key
-	// stk = 4 has the value for the key mentioned above
+
 	while (lua_next(L, stk))
 	{
 		int idx = 0;
-		const char *framestr = NULL;
 		switch (lua_type(L, stk+1))
 		{
 		case LUA_TSTRING:
-				framestr = lua_tostring(L, stk+1);
-				idx = R_Char2Frame(framestr[0]);
-				break;
 		case LUA_TNUMBER:
-				idx = lua_tonumber(L, stk+1);
+			idx = GetSpriteInfoFrameIndex(L, stk+1);
 			break;
 		default:
 			TYPEERROR("pivot frame", LUA_TNUMBER, lua_type(L, stk+1));
 		}
-		if ((idx < 0) || (idx >= 64))
-			return luaL_error(L, "pivot frame %d out of range (0 - %d)", idx, 63);
+
 		// the values in pivot[] are also tables
-		if (PopPivotSubTable(info->pivot, L, stk+2, idx))
-			info->available = true;
+		if (PopPivotSubTable(&info->frames[idx], L, stk+2))
+		{
+			set_bit_array(info->available, idx);
+
+			// TODO: 2.3: Delete
+			info->frames[SPRINFO_DEFAULT_FRAME].pivot.available = true;
+			set_bit_array(info->available, SPRINFO_DEFAULT_FRAME);
+		}
+
 		lua_pop(L, 1);
 	}
 
@@ -409,6 +496,14 @@ static int lib_setSpriteInfo(lua_State *L)
 			else
 				FIELDERROR("pivot", va("%s expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
 		}
+		else if (str && fastcmp(str, "frames"))
+		{
+			// frames[] is a table
+			if (lua_istable(L, 3))
+				return PopFrameTable(info, L, 3);
+			else
+				FIELDERROR("frames", va("%s expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
+		}
 
 		lua_pop(L, 1);
 	}
@@ -434,17 +529,26 @@ static int spriteinfo_get(lua_State *L)
 	I_Assert(sprinfo != NULL);
 
 	// push spriteframepivot_t userdata
+	// TODO: 2.3: delete
 	if (fastcmp(field, "pivot"))
 	{
-		// bypass LUA_PushUserdata
 		void **userdata = lua_newuserdata(L, sizeof(void *));
-		*userdata = &sprinfo->pivot;
+		*userdata = sprinfo;
 		luaL_getmetatable(L, META_PIVOTLIST);
 		lua_setmetatable(L, -2);
 
 		// stack is left with the userdata on top, as if getting it had originally succeeded.
 		return 1;
 	}
+	else if (fastcmp(field, "frames"))
+	{
+		void **userdata = lua_newuserdata(L, sizeof(void *));
+		*userdata = sprinfo;
+		luaL_getmetatable(L, META_SPRITEINFOFRAMELIST);
+		lua_setmetatable(L, -2);
+
+		return 1;
+	}
 	else
 		return luaL_error(L, LUA_QL("spriteinfo_t") " has no field named " LUA_QS, field);
 
@@ -477,9 +581,28 @@ static int spriteinfo_set(lua_State *L)
 		// pivot[] is userdata
 		else if (lua_isuserdata(L, 1))
 		{
-			spriteframepivot_t *pivot = *((spriteframepivot_t **)luaL_checkudata(L, 1, META_PIVOTLIST));
-			memcpy(&sprinfo->pivot, pivot, sizeof(spriteframepivot_t));
-			sprinfo->available = true; // Just in case?
+			spriteinfo_t *copyinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_PIVOTLIST));
+			for (UINT16 i = 0; i <= MAXFRAMENUM; i++)
+			{
+				if (in_bit_array(copyinfo->available, i))
+					memcpy(&sprinfo->frames[i].pivot, &copyinfo->frames[i].pivot, sizeof(spriteframepivot_t));
+			}
+		}
+	}
+	else if (fastcmp(field, "frames"))
+	{
+		// frames[] is a table
+		if (lua_istable(L, 1))
+			return PopFrameTable(sprinfo, L, 1);
+		// frames[] is userdata
+		else if (lua_isuserdata(L, 1))
+		{
+			spriteinfo_t *copyinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_SPRITEINFOFRAMELIST));
+			for (UINT16 i = 0; i <= MAXFRAMENUM; i++)
+			{
+				if (in_bit_array(copyinfo->available, i))
+					memcpy(&sprinfo->frames[i], &copyinfo->frames[i], sizeof(spriteinfoframe_t));
+			}
 		}
 	}
 	else
@@ -499,21 +622,138 @@ static int spriteinfo_num(lua_State *L)
 	return 1;
 }
 
-// framepivot_t
-static int pivotlist_get(lua_State *L)
+// spriteinfoframe_t
+static int framelist_get(lua_State *L)
+{
+	struct SpriteInfoFrame *container;
+	spriteinfo_t *sprinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_SPRITEINFOFRAMELIST));
+	UINT16 frame = GetSpriteInfoFrameIndex(L, 2);
+
+	container = lua_newuserdata(L, sizeof *container);
+	container->sprinfo = sprinfo;
+	container->frame = frame;
+	luaL_getmetatable(L, META_SPRITEINFOFRAME);
+	lua_setmetatable(L, -2);
+
+	// stack is left with the userdata on top, as if getting it had originally succeeded.
+	return 1;
+}
+
+static int framelist_set(lua_State *L)
 {
-	void **userdata;
-	spriteframepivot_t *framepivot = *((spriteframepivot_t **)luaL_checkudata(L, 1, META_PIVOTLIST));
+	spriteinfo_t *sprinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_SPRITEINFOFRAMELIST));
+	UINT16 frame;
+	int okcool = 0;
+
+	if (!lua_lumploading)
+		return luaL_error(L, "Do not alter spriteinfoframe_t from within a hook or coroutine!");
+	if (hud_running)
+		return luaL_error(L, "Do not alter spriteinfoframe_t in HUD rendering code!");
+	if (hook_cmd_running)
+		return luaL_error(L, "Do not alter spriteinfoframe_t in CMD building code!");
+
+	frame = GetSpriteInfoFrameIndex(L, 2);
+
+	// frames[] is a table
+	if (lua_istable(L, 3))
+		okcool = PopFrameSubTable(&sprinfo->frames[frame], L, 3);
+	// frames[] is userdata
+	else if (lua_isuserdata(L, 3))
+	{
+		struct SpriteInfoFrame *container = luaL_checkudata(L, 3, META_SPRITEINFOFRAME);
+		memcpy(&sprinfo->frames[frame],
+			&container->sprinfo->frames[container->frame],
+			sizeof(spriteinfoframe_t));
+		okcool = 1;
+	}
+
+	if (okcool)
+		set_bit_array(sprinfo->available, frame);
+
+	return 0;
+}
+
+static int framelist_num(lua_State *L)
+{
+	lua_pushinteger(L, MAXFRAMENUM);
+	return 1;
+}
+
+// spriteinfoframe_t
+static int sprinfoframe_get(lua_State *L)
+{
+	struct SpriteInfoFrame *container = luaL_checkudata(L, 1, META_SPRITEINFOFRAME);
 	const char *field = luaL_checkstring(L, 2);
-	UINT8 frame;
 
-	frame = R_Char2Frame(field[0]);
-	if (frame == 255)
-		luaL_error(L, "invalid frame %s", field);
+	if (fastcmp("pivot", field))
+	{
+		struct SpriteInfoFrame *other_container = lua_newuserdata(L, sizeof *container);
+		memcpy(other_container, container, sizeof *container);
+		luaL_getmetatable(L, META_FRAMEPIVOT);
+		lua_setmetatable(L, -2);
+	}
+	else
+		return luaL_error(L, "Field %s does not exist in spriteinfoframe_t", field);
+
+	return 1;
+}
 
-	// bypass LUA_PushUserdata
-	userdata = lua_newuserdata(L, sizeof(void *));
-	*userdata = &framepivot[frame];
+static int sprinfoframe_set(lua_State *L)
+{
+	struct SpriteInfoFrame *container = luaL_checkudata(L, 1, META_SPRITEINFOFRAME);
+	spriteinfoframe_t *frame = &container->sprinfo->frames[container->frame];
+	UINT8 *available = container->sprinfo->available;
+	const char *field = luaL_checkstring(L, 2);
+	boolean is_available = false;
+
+	if (!lua_lumploading)
+		return luaL_error(L, "Do not alter spriteinfoframe_t from within a hook or coroutine!");
+	if (hud_running)
+		return luaL_error(L, "Do not alter spriteinfoframe_t in HUD rendering code!");
+	if (hook_cmd_running)
+		return luaL_error(L, "Do not alter spriteinfoframe_t in CMD building code!");
+
+	I_Assert(frame != NULL);
+
+	if (fastcmp("pivot", field))
+	{
+		// pivot[] is a table
+		if (lua_istable(L, 3))
+		{
+			if (PopPivotSubTable(frame, L, 3))
+				is_available = true;
+		}
+		// pivot[] is userdata
+		else if (lua_isuserdata(L, 3))
+		{
+			struct SpriteInfoFrame *other_container = luaL_checkudata(L, 3, META_FRAMEPIVOT);
+			memcpy(&frame->pivot,
+				&other_container->sprinfo->frames[other_container->frame].pivot,
+				sizeof(spriteframepivot_t));
+			is_available = true;
+		}
+	}
+	else
+		return luaL_error(L, "Field %s does not exist in spriteframepivot_t", field);
+
+	if (is_available)
+	{
+		set_bit_array(available, container->frame);
+	}
+
+	return 0;
+}
+
+// framepivot_t
+static int pivotlist_get(lua_State *L)
+{
+	struct SpriteInfoFrame *container;
+	spriteinfo_t *sprinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_PIVOTLIST));
+	UINT16 frame = GetSpriteInfoFrameIndex(L, 2);
+
+	container = lua_newuserdata(L, sizeof *container);
+	container->sprinfo = sprinfo;
+	container->frame = frame;
 	luaL_getmetatable(L, META_FRAMEPIVOT);
 	lua_setmetatable(L, -2);
 
@@ -523,11 +763,9 @@ static int pivotlist_get(lua_State *L)
 
 static int pivotlist_set(lua_State *L)
 {
-	// Because I already know it's a spriteframepivot_t anyway
-	spriteframepivot_t *pivotlist = *((spriteframepivot_t **)lua_touserdata(L, 1));
-	//spriteframepivot_t *framepivot = *((spriteframepivot_t **)luaL_checkudata(L, 1, META_FRAMEPIVOT));
-	const char *field = luaL_checkstring(L, 2);
-	UINT8 frame;
+	spriteinfo_t *sprinfo = *((spriteinfo_t **)luaL_checkudata(L, 1, META_PIVOTLIST));
+	UINT16 frame;
+	int okcool = 0;
 
 	if (!lua_lumploading)
 		return luaL_error(L, "Do not alter spriteframepivot_t from within a hook or coroutine!");
@@ -536,32 +774,37 @@ static int pivotlist_set(lua_State *L)
 	if (hook_cmd_running)
 		return luaL_error(L, "Do not alter spriteframepivot_t in CMD building code!");
 
-	frame = R_Char2Frame(field[0]);
-	if (frame == 255)
-		luaL_error(L, "invalid frame %s", field);
+	frame = GetSpriteInfoFrameIndex(L, 2);
 
 	// pivot[] is a table
 	if (lua_istable(L, 3))
-		return PopPivotSubTable(pivotlist, L, 3, frame);
+		okcool = PopPivotSubTable(&sprinfo->frames[frame], L, 3);
 	// pivot[] is userdata
 	else if (lua_isuserdata(L, 3))
 	{
-		spriteframepivot_t *copypivot = *((spriteframepivot_t **)luaL_checkudata(L, 3, META_FRAMEPIVOT));
-		memcpy(&pivotlist[frame], copypivot, sizeof(spriteframepivot_t));
+		struct SpriteInfoFrame *container = luaL_checkudata(L, 3, META_FRAMEPIVOT);
+		memcpy(&sprinfo->frames[frame].pivot,
+			&container->sprinfo->frames[container->frame].pivot,
+			sizeof(spriteframepivot_t));
+		okcool = 1;
 	}
 
+	if (okcool)
+		set_bit_array(sprinfo->available, frame);
+
 	return 0;
 }
 
 static int pivotlist_num(lua_State *L)
 {
-	lua_pushinteger(L, 64);
+	lua_pushinteger(L, MAXFRAMENUM);
 	return 1;
 }
 
 static int framepivot_get(lua_State *L)
 {
-	spriteframepivot_t *framepivot = *((spriteframepivot_t **)luaL_checkudata(L, 1, META_FRAMEPIVOT));
+	struct SpriteInfoFrame *container = luaL_checkudata(L, 1, META_FRAMEPIVOT);
+	spriteframepivot_t *framepivot = &container->sprinfo->frames[container->frame].pivot;
 	const char *field = luaL_checkstring(L, 2);
 
 	I_Assert(framepivot != NULL);
@@ -584,7 +827,9 @@ static int framepivot_get(lua_State *L)
 
 static int framepivot_set(lua_State *L)
 {
-	spriteframepivot_t *framepivot = *((spriteframepivot_t **)luaL_checkudata(L, 1, META_FRAMEPIVOT));
+	struct SpriteInfoFrame *container = luaL_checkudata(L, 1, META_FRAMEPIVOT);
+	spriteframepivot_t *framepivot = &container->sprinfo->frames[container->frame].pivot;
+	UINT8 *available = container->sprinfo->available;
 	const char *field = luaL_checkstring(L, 2);
 
 	if (!lua_lumploading)
@@ -597,9 +842,15 @@ static int framepivot_set(lua_State *L)
 	I_Assert(framepivot != NULL);
 
 	if (fastcmp("x", field))
+	{
 		framepivot->x = luaL_checkinteger(L, 3);
+		set_bit_array(available, container->frame);
+	}
 	else if (fastcmp("y", field))
+	{
 		framepivot->y = luaL_checkinteger(L, 3);
+		set_bit_array(available, container->frame);
+	}
 	// TODO: 2.3: delete
 	else if (fastcmp("rotaxis", field))
 		LUA_UsageWarning(L, "\"rotaxis\" is deprecated and will be removed.")
@@ -726,21 +977,19 @@ static int lib_setState(lua_State *L)
 			switch(lua_type(L, 3))
 			{
 			case LUA_TNIL: // Null? Set the action to nothing, then.
-				state->action.acp1 = NULL;
+				state->action = NULL;
 				break;
 			case LUA_TSTRING: // It's a string, expect the name of a built-in action
 				LUA_SetActionByName(state, lua_tostring(L, 3));
 				break;
 			case LUA_TUSERDATA: // It's a userdata, expect META_ACTION of a built-in action
 			{
-				actionf_t *action = *((actionf_t **)luaL_checkudata(L, 3, META_ACTION));
+				actionf_p1 *action = *((actionf_p1 **)luaL_checkudata(L, 3, META_ACTION));
 
 				if (!action)
 					return luaL_error(L, "not a valid action?");
 
 				state->action = *action;
-				state->action.acv = action->acv;
-				state->action.acp1 = action->acp1;
 				break;
 			}
 			case LUA_TFUNCTION: // It's a function (a Lua function or a C function? either way!)
@@ -750,7 +999,7 @@ static int lib_setState(lua_State *L)
 				lua_pushvalue(L, 3); // Bring it to the top of the stack
 				lua_rawset(L, -3); // Set it in the registry
 				lua_pop(L, 1); // pop LREG_STATEACTION
-				state->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+				state->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 				break;
 			default: // ?!
 				return luaL_typerror(L, 3, "function");
@@ -808,7 +1057,7 @@ boolean LUA_SetLuaAction(void *stv, const char *action)
 	lua_pop(gL, 1); // pop LREG_STATEACTION
 
 	lua_pop(gL, 2); // pop the function and LREG_ACTIONS
-	st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+	st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 	return true; // action successfully set.
 }
 
@@ -913,9 +1162,9 @@ static int state_get(lua_State *L)
 		number = st->tics;
 	else if (fastcmp(field,"action")) {
 		const char *name;
-		if (!st->action.acp1) // Action is NULL.
+		if (!st->action) // Action is NULL.
 			return 0; // return nil.
-		if (st->action.acp1 == (actionf_p1)A_Lua) { // This is a Lua function?
+		if (st->action == (actionf_p1)A_Lua) { // This is a Lua function?
 			lua_getfield(L, LUA_REGISTRYINDEX, LREG_STATEACTION);
 			I_Assert(lua_istable(L, -1));
 			lua_pushlightuserdata(L, st); // Push the state pointer and
@@ -970,21 +1219,19 @@ static int state_set(lua_State *L)
 		switch(lua_type(L, 3))
 		{
 		case LUA_TNIL: // Null? Set the action to nothing, then.
-			st->action.acp1 = NULL;
+			st->action = NULL;
 			break;
 		case LUA_TSTRING: // It's a string, expect the name of a built-in action
 			LUA_SetActionByName(st, lua_tostring(L, 3));
 			break;
 		case LUA_TUSERDATA: // It's a userdata, expect META_ACTION of a built-in action
 		{
-			actionf_t *action = *((actionf_t **)luaL_checkudata(L, 3, META_ACTION));
+			actionf_p1 *action = *((actionf_p1 **)luaL_checkudata(L, 3, META_ACTION));
 
 			if (!action)
 				return luaL_error(L, "not a valid action?");
 
 			st->action = *action;
-			st->action.acv = action->acv;
-			st->action.acp1 = action->acp1;
 			break;
 		}
 		case LUA_TFUNCTION: // It's a function (a Lua function or a C function? either way!)
@@ -994,7 +1241,7 @@ static int state_set(lua_State *L)
 			lua_pushvalue(L, 3); // Bring it to the top of the stack
 			lua_rawset(L, -3); // Set it in the registry
 			lua_pop(L, 1); // pop LREG_STATEACTION
-			st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+			st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 			break;
 		default: // ?!
 			return luaL_typerror(L, 3, "function");
@@ -1170,6 +1417,7 @@ enum mobjinfo_e
 	mobjinfo_activesound,
 	mobjinfo_flags,
 	mobjinfo_raisestate,
+	mobjinfo_name,
 };
 
 const char *const mobjinfo_opt[] = {
@@ -1197,6 +1445,7 @@ const char *const mobjinfo_opt[] = {
 	"activesound",
 	"flags",
 	"raisestate",
+	"name",
 	NULL,
 };
 
@@ -1211,6 +1460,8 @@ static int mobjinfo_get(lua_State *L)
 	I_Assert(info != NULL);
 	I_Assert(info >= mobjinfo);
 
+	mobjtype_t id = info-mobjinfo;
+
 	switch (field)
 	{
 	case mobjinfo_doomednum:
@@ -1285,6 +1536,21 @@ static int mobjinfo_get(lua_State *L)
 	case mobjinfo_raisestate:
 		lua_pushinteger(L, info->raisestate);
 		break;
+	case mobjinfo_name:
+		if (id < MT_FIRSTFREESLOT)
+		{
+			lua_pushstring(L, MOBJTYPE_LIST[id]+3);
+			return 1;
+		}
+
+		id -= MT_FIRSTFREESLOT;
+		if (id < NUMMOBJFREESLOTS && FREE_MOBJS[id])
+		{
+			lua_pushstring(L, FREE_MOBJS[id]);
+			return 1;
+		}
+
+		return 0;
 	default:
 		lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS);
 		I_Assert(lua_istable(L, -1));
@@ -1747,7 +2013,7 @@ static int lib_setSkinColor(lua_State *L)
 		else if (i == 6 || (str && fastcmp(str,"accessible"))) {
 			boolean v = lua_toboolean(L, 3);
 			if (cnum < FIRSTSUPERCOLOR && v != skincolors[cnum].accessible)
-				CONS_Alert(CONS_WARNING, "skincolors[] index %d is a standard color; accessibility changes are prohibited.", cnum);
+				CONS_Alert(CONS_WARNING, "skincolors[] index %d is a standard color; accessibility changes are prohibited.\n", cnum);
 			else
 				info->accessible = v;
 		}
@@ -1842,7 +2108,7 @@ static int skincolor_set(lua_State *L)
 	else if (fastcmp(field,"accessible")) {
 		boolean v = lua_toboolean(L, 3);
 		if (cnum < FIRSTSUPERCOLOR && v != skincolors[cnum].accessible)
-			CONS_Alert(CONS_WARNING, "skincolors[] index %d is a standard color; accessibility changes are prohibited.", cnum);
+			CONS_Alert(CONS_WARNING, "skincolors[] index %d is a standard color; accessibility changes are prohibited.\n", cnum);
 		else
 			info->accessible = v;
 	} else
@@ -1921,6 +2187,8 @@ int LUA_InfoLib(lua_State *L)
 	LUA_RegisterUserdataMetatable(L, META_COLORRAMP, colorramp_get, colorramp_set, colorramp_len);
 	LUA_RegisterUserdataMetatable(L, META_SFXINFO, sfxinfo_get, sfxinfo_set, sfxinfo_num);
 	LUA_RegisterUserdataMetatable(L, META_SPRITEINFO, spriteinfo_get, spriteinfo_set, spriteinfo_num);
+	LUA_RegisterUserdataMetatable(L, META_SPRITEINFOFRAMELIST, framelist_get, framelist_set, framelist_num);
+	LUA_RegisterUserdataMetatable(L, META_SPRITEINFOFRAME, sprinfoframe_get, sprinfoframe_set, NULL);
 	LUA_RegisterUserdataMetatable(L, META_PIVOTLIST, pivotlist_get, pivotlist_set, pivotlist_num);
 	LUA_RegisterUserdataMetatable(L, META_FRAMEPIVOT, framepivot_get, framepivot_set, framepivot_num);
 	LUA_RegisterUserdataMetatable(L, META_LUABANKS, lib_getluabanks, lib_setluabanks, lib_luabankslen);

src/lua_inputlib.c

@@ -10,16 +10,19 @@
 /// \brief input library for Lua scripting
 
 #include "doomdef.h"
+#include "doomstat.h"
 #include "fastcmp.h"
 #include "g_input.h"
 #include "g_game.h"
 #include "hu_stuff.h"
 #include "i_system.h"
+#include "console.h"
 
 #include "lua_script.h"
 #include "lua_libs.h"
 
 boolean mousegrabbedbylua = true;
+boolean textinputmodeenabledbylua = false;
 boolean ignoregameinputs = false;
 
 ///////////////
@@ -129,6 +132,20 @@ static int lib_getCursorPosition(lua_State *L)
 	return 2;
 }
 
+static int lib_setTextInputMode(lua_State *L)
+{
+	textinputmodeenabledbylua = luaL_checkboolean(L, 1);
+	if (!(menuactive || CON_Ready() || chat_on))
+		I_SetTextInputMode(textinputmodeenabledbylua);
+	return 0;
+}
+
+static int lib_getTextInputMode(lua_State *L)
+{
+	lua_pushinteger(L, textinputmodeenabledbylua);
+	return 1;
+}
+
 static luaL_Reg lib[] = {
 	{"gameControlDown", lib_gameControlDown},
 	{"gameControl2Down", lib_gameControl2Down},
@@ -143,6 +160,8 @@ static luaL_Reg lib[] = {
 	{"getMouseGrab", lib_getMouseGrab},
 	{"setMouseGrab", lib_setMouseGrab},
 	{"getCursorPosition", lib_getCursorPosition},
+	{"setTextInputMode", lib_setTextInputMode},
+	{"getTextInputMode", lib_getTextInputMode},
 	{NULL, NULL}
 };
 
@@ -220,6 +239,28 @@ static int lib_lenGameKeyDown(lua_State *L)
 	return 1;
 }
 
+////////////////
+// TEXT EVENT //
+////////////////
+
+static int textevent_get(lua_State *L)
+{
+	event_t *event = *((event_t **)luaL_checkudata(L, 1, META_TEXTEVENT));
+	const char *field = luaL_checkstring(L, 2);
+
+	I_Assert(event != NULL);
+
+	if (fastcmp(field,"text"))
+	{
+		char s[2] = { event->key, 0 };
+		lua_pushstring(L, s);
+	}
+	else
+		return luaL_error(L, "textevent_t has no field named %s", field);
+
+	return 1;
+}
+
 ///////////////
 // KEY EVENT //
 ///////////////
@@ -285,6 +326,7 @@ static int mouse_num(lua_State *L)
 
 int LUA_InputLib(lua_State *L)
 {
+	LUA_RegisterUserdataMetatable(L, META_TEXTEVENT, textevent_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_KEYEVENT, keyevent_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_MOUSE, mouse_get, NULL, mouse_num);
 

src/lua_interceptlib.c

+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024-2024 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_interceptlib.c
+/// \brief intercept library for Lua scripting
+
+#include "doomdef.h"
+#include "fastcmp.h"
+#include "p_local.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+
+#include "lua_hud.h" // hud_running errors
+
+#define NOHUD if (hud_running)\
+return luaL_error(L, "HUD rendering code should not call this function!");
+
+enum intercept_e {
+	intercept_valid = 0,
+	intercept_frac,
+	intercept_thing,
+	intercept_line
+};
+
+static const char *const intercept_opt[] = {
+	"valid",
+	"frac",
+	"thing",
+	"line",
+	NULL};
+
+static int intercept_fields_ref = LUA_NOREF;
+
+static boolean Lua_PathTraverser(intercept_t *in)
+{
+	boolean traverse = false;
+	I_Assert(in != NULL);
+	
+	lua_settop(gL, 6);
+	lua_pushcfunction(gL, LUA_GetErrorMessage);
+	
+	I_Assert(lua_isfunction(gL, -2));
+	
+	lua_pushvalue(gL, -2);
+	LUA_PushUserdata(gL, in, META_INTERCEPT);
+	LUA_Call(gL, 1, 1, -3);
+	
+	traverse = lua_toboolean(gL, -1);
+	lua_pop(gL, 1);
+	
+	return !traverse; // Stay consistent with the MobjMoveCollide hook
+}
+
+static int intercept_get(lua_State *L)
+{
+	intercept_t *in = *((intercept_t **)luaL_checkudata(L, 1, META_INTERCEPT));
+	enum intercept_e field = Lua_optoption(L, 2, intercept_valid, intercept_fields_ref);
+	
+	if (!in)
+	{
+		if (field == intercept_valid) {
+			lua_pushboolean(L, 0);
+			return 1;
+		}
+		return luaL_error(L, "accessed intercept_t doesn't exist anymore.");
+	}
+	
+	switch(field)
+	{
+	case intercept_valid: // valid
+		lua_pushboolean(L, 1);
+		return 1;
+	case intercept_frac:
+		lua_pushfixed(L, in->frac);
+		return 1;
+	case intercept_thing:
+		if (in->isaline)
+			return 0;
+		LUA_PushUserdata(L, in->d.thing, META_MOBJ);
+		return 1;
+	case intercept_line:
+		if (!in->isaline)
+			return 0;
+		LUA_PushUserdata(L, in->d.line, META_LINE);
+		return 1;
+	}
+	return 0;
+}
+
+static int lib_pPathTraverse(lua_State *L)
+{
+	fixed_t px1 = luaL_checkfixed(L, 1);
+	fixed_t py1 = luaL_checkfixed(L, 2);
+	fixed_t px2 = luaL_checkfixed(L, 3);
+	fixed_t py2 = luaL_checkfixed(L, 4);
+	INT32 flags = (INT32)luaL_checkinteger(L, 5);
+	luaL_checktype(L, 6, LUA_TFUNCTION);
+	NOHUD
+	INLEVEL
+	lua_pushboolean(L, P_PathTraverse(px1, py1, px2, py2, flags, Lua_PathTraverser));
+	return 1;
+}
+
+int LUA_InterceptLib(lua_State *L)
+{
+	LUA_RegisterUserdataMetatable(L, META_INTERCEPT, intercept_get, NULL, NULL);
+	intercept_fields_ref = Lua_CreateFieldTable(L, intercept_opt);
+	lua_register(L, "P_PathTraverse", lib_pPathTraverse);
+	return 0;
+}

src/lua_libs.h

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -13,6 +13,7 @@
 extern lua_State *gL;
 
 extern boolean mousegrabbedbylua;
+extern boolean textinputmodeenabledbylua;
 extern boolean ignoregameinputs;
 
 #define MUTABLE_TAGS
@@ -29,6 +30,8 @@ extern boolean ignoregameinputs;
 #define META_SKINCOLOR "SKINCOLOR_T*"
 #define META_COLORRAMP "SKINCOLOR_T*RAMP"
 #define META_SPRITEINFO "SPRITEINFO_T*"
+#define META_SPRITEINFOFRAMELIST "SPRITEINFOFRAME_T[]"
+#define META_SPRITEINFOFRAME "SPRITEINFOFRAME_T*"
 #define META_PIVOTLIST "SPRITEFRAMEPIVOT_T[]"
 #define META_FRAMEPIVOT "SPRITEFRAMEPIVOT_T*"
 
@@ -42,8 +45,11 @@ extern boolean ignoregameinputs;
 #define META_SKIN "SKIN_T*"
 #define META_POWERS "PLAYER_T*POWERS"
 #define META_SOUNDSID "SKIN_T*SOUNDSID"
-#define META_SKINSPRITES "SKIN_T*SPRITES"
-#define META_SKINSPRITESLIST "SKIN_T*SPRITES[]"
+#define META_SKINSPRITES "SKIN_T*SKINSPRITES"
+#define META_SKINSPRITESLIST "SKIN_T*SKINSPRITES[]"
+#define META_SKINSPRITESCOMPAT "SKIN_T*SPRITES" // TODO: 2.3: Delete
+
+#define META_MUSICDEF "MUSICDEF_T*"
 
 #define META_VERTEX "VERTEX_T*"
 #define META_LINE "LINE_T*"
@@ -51,13 +57,7 @@ extern boolean ignoregameinputs;
 #define META_SUBSECTOR "SUBSECTOR_T*"
 #define META_SECTOR "SECTOR_T*"
 #define META_FFLOOR "FFLOOR_T*"
-#ifdef HAVE_LUA_SEGS
-#define META_SEG "SEG_T*"
-#define META_NODE "NODE_T*"
-#endif
 #define META_SLOPE "PSLOPE_T*"
-#define META_VECTOR2 "VECTOR2_T"
-#define META_VECTOR3 "VECTOR3_T"
 #define META_MAPHEADER "MAPHEADER_T*"
 
 #define META_POLYOBJ "POLYOBJ_T*"
@@ -68,17 +68,17 @@ extern boolean ignoregameinputs;
 #ifdef MUTABLE_TAGS
 #define META_SECTORTAGLIST "sector_t.taglist"
 #endif
+#define META_SECTORCUSTOMARGS "SECTOR_T*CUSTOMARGS"
 #define META_SIDENUM "LINE_T*SIDENUM"
 #define META_LINEARGS "LINE_T*ARGS"
 #define META_LINESTRINGARGS "LINE_T*STRINGARGS"
+#define META_LINECUSTOMARGS "LINE_T*CUSTOMARGS"
+#define META_SIDECUSTOMARGS "SIDE_T*CUSTOMARGS"
 #define META_THINGARGS "MAPTHING_T*ARGS"
 #define META_THINGSTRINGARGS "MAPTHING_T*STRINGARGS"
+#define META_THINGCUSTOMARGS "MAPTHING_T*CUSTOMARGS"
 #define META_POLYOBJVERTICES "POLYOBJ_T*VERTICES"
 #define META_POLYOBJLINES "POLYOBJ_T*LINES"
-#ifdef HAVE_LUA_SEGS
-#define META_NODEBBOX "NODE_T*BBOX"
-#define META_NODECHILDREN "NODE_T*CHILDREN"
-#endif
 
 #define META_BBOX "BOUNDING_BOX"
 
@@ -92,9 +92,17 @@ extern boolean ignoregameinputs;
 
 #define META_LUABANKS "LUABANKS[]*"
 
+#define META_TEXTEVENT "TEXTEVENT_T*"
 #define META_KEYEVENT "KEYEVENT_T*"
 #define META_MOUSE "MOUSE_T*"
 
+#define META_INTERCEPT "INTERCEPT_T*"
+
+#define META_VECTOR2 "VECTOR2_T"
+#define META_VECTOR3 "VECTOR3_T"
+#define META_MATRIX "MATRIX_T"
+#define META_QUATERNION "QUATERNION_T"
+
 boolean luaL_checkboolean(lua_State *L, int narg);
 
 int LUA_EnumLib(lua_State *L);
@@ -115,3 +123,7 @@ int LUA_BlockmapLib(lua_State *L);
 int LUA_HudLib(lua_State *L);
 int LUA_ColorLib(lua_State *L);
 int LUA_InputLib(lua_State *L);
+int LUA_InterceptLib(lua_State *L);
+int LUA_MatrixLib(lua_State *L);
+int LUA_QuaternionLib(lua_State *L);
+int LUA_VectorLib(lua_State *L);

src/lua_maplib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -69,6 +69,7 @@ enum sector_e {
 	sector_triggerer,
 	sector_friction,
 	sector_gravity,
+	sector_customargs
 };
 
 static const char *const sector_opt[] = {
@@ -112,6 +113,7 @@ static const char *const sector_opt[] = {
 	"triggerer",
 	"friction",
 	"gravity",
+	"customargs",
 	NULL};
 
 static int sector_fields_ref = LUA_NOREF;
@@ -147,6 +149,7 @@ enum line_e {
 	line_taglist,
 	line_args,
 	line_stringargs,
+	line_customargs,
 	line_sidenum,
 	line_frontside,
 	line_backside,
@@ -173,6 +176,7 @@ static const char *const line_opt[] = {
 	"taglist",
 	"args",
 	"stringargs",
+	"customargs",
 	"sidenum",
 	"frontside",
 	"backside",
@@ -213,7 +217,16 @@ enum side_e {
 	side_sector,
 	side_special,
 	side_repeatcnt,
-	side_text
+	side_light,
+	side_light_top,
+	side_light_mid,
+	side_light_bottom,
+	side_lightabsolute,
+	side_lightabsolute_top,
+	side_lightabsolute_mid,
+	side_lightabsolute_bottom,
+	side_text,
+	side_customargs
 };
 
 static const char *const side_opt[] = {
@@ -241,7 +254,16 @@ static const char *const side_opt[] = {
 	"sector",
 	"special",
 	"repeatcnt",
+	"light",
+	"light_top",
+	"light_mid",
+	"light_bottom",
+	"lightabsolute",
+	"lightabsolute_top",
+	"lightabsolute_mid",
+	"lightabsolute_bottom",
 	"text",
+	"customargs",
 	NULL};
 
 static int side_fields_ref = LUA_NOREF;
@@ -338,72 +360,6 @@ static const char *const ffloor_opt[] = {
 
 static int ffloor_fields_ref = LUA_NOREF;
 
-#ifdef HAVE_LUA_SEGS
-enum seg_e {
-	seg_valid = 0,
-	seg_v1,
-	seg_v2,
-	seg_side,
-	seg_offset,
-	seg_angle,
-	seg_sidedef,
-	seg_linedef,
-	seg_frontsector,
-	seg_backsector,
-	seg_polyseg
-};
-
-static const char *const seg_opt[] = {
-	"valid",
-	"v1",
-	"v2",
-	"side",
-	"offset",
-	"angle",
-	"sidedef",
-	"linedef",
-	"frontsector",
-	"backsector",
-	"polyseg",
-	NULL};
-
-static int seg_fields_ref = LUA_NOREF;
-
-enum node_e {
-	node_valid = 0,
-	node_x,
-	node_y,
-	node_dx,
-	node_dy,
-	node_bbox,
-	node_children,
-};
-
-static const char *const node_opt[] = {
-	"valid",
-	"x",
-	"y",
-	"dx",
-	"dy",
-	"bbox",
-	"children",
-	NULL};
-
-static int node_fields_ref = LUA_NOREF;
-
-enum nodechild_e {
-	nodechild_valid = 0,
-	nodechild_right,
-	nodechild_left,
-};
-
-static const char *const nodechild_opt[] = {
-	"valid",
-	"right",
-	"left",
-	NULL};
-#endif
-
 enum bbox_e {
 	bbox_valid = 0,
 	bbox_top,
@@ -444,19 +400,6 @@ static const char *const slope_opt[] = {
 
 static int slope_fields_ref = LUA_NOREF;
 
-// shared by both vector2_t and vector3_t
-enum vector_e {
-	vector_x = 0,
-	vector_y,
-	vector_z
-};
-
-static const char *const vector_opt[] = {
-	"x",
-	"y",
-	"z",
-	NULL};
-
 static const char *const array_opt[] ={"iterate",NULL};
 static const char *const valid_opt[] ={"valid",NULL};
 
@@ -658,6 +601,73 @@ static int sectorlines_num(lua_State *L)
 	return 1;
 }
 
+//////////////////
+// customargs_t //
+//////////////////
+
+FUNCINLINE static ATTRINLINE int customargs_get(lua_State* L, const char* meta)
+{
+	customargs_t *args = *((customargs_t**)luaL_checkudata(L, 1, meta));
+	const char* field = luaL_checkstring(L, 2);
+
+	if (args == NULL) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	customargs_t* current = args;
+	while (current != NULL)
+	{
+		if (!strcmp(current->name, field))
+		{
+			switch (current->type)
+			{
+				case UDMF_TYPE_STRING:
+					lua_pushstring(L, current->value.vstring);
+					break;
+				case UDMF_TYPE_NUMERIC:
+					lua_pushinteger(L, current->value.vint);
+					break;
+				case UDMF_TYPE_FIXED:
+					lua_pushfixed(L, current->value.vfloat);
+					break;
+				case UDMF_TYPE_BOOLEAN:
+					lua_pushboolean(L, current->value.vbool);
+					break;
+				default:
+					lua_pushnil(L);
+			}
+
+			return 1;
+		}
+
+		current = current->next;
+	}
+
+	lua_pushnil(L);
+	return 1;
+}
+
+static int sectorcustomargs_get(lua_State* L)
+{
+	return customargs_get(L, META_SECTORCUSTOMARGS);
+}
+
+static int sidecustomargs_get(lua_State* L)
+{
+	return customargs_get(L, META_SIDECUSTOMARGS);
+}
+
+static int linecustomargs_get(lua_State* L)
+{
+	return customargs_get(L, META_LINECUSTOMARGS);
+}
+
+static int thingcustomargs_get(lua_State* L)
+{
+	return customargs_get(L, META_THINGCUSTOMARGS);
+}
+
 //////////////
 // sector_t //
 //////////////
@@ -819,6 +829,9 @@ static int sector_get(lua_State *L)
 	case sector_gravity: // gravity
 		lua_pushfixed(L, sector->gravity);
 		return 1;
+	case sector_customargs:
+		LUA_PushUserdata(L, sector->customargs, META_SECTORCUSTOMARGS);
+		return 1;
 	}
 	return 0;
 }
@@ -1114,6 +1127,9 @@ static int line_get(lua_State *L)
 	case line_stringargs:
 		LUA_PushUserdata(L, line->stringargs, META_LINESTRINGARGS);
 		return 1;
+	case line_customargs:
+		LUA_PushUserdata(L, line->customargs, META_LINECUSTOMARGS);
+		return 1;
 	case line_sidenum:
 		LUA_PushUserdata(L, line->sidenum, META_SIDENUM);
 		return 1;
@@ -1311,6 +1327,33 @@ static int side_get(lua_State *L)
 	case side_repeatcnt:
 		lua_pushinteger(L, side->repeatcnt);
 		return 1;
+	case side_light:
+		lua_pushinteger(L, side->light);
+		return 1;
+	case side_light_top:
+		lua_pushinteger(L, side->light_top);
+		return 1;
+	case side_light_mid:
+		lua_pushinteger(L, side->light_mid);
+		return 1;
+	case side_light_bottom:
+		lua_pushinteger(L, side->light_bottom);
+		return 1;
+	case side_lightabsolute:
+		lua_pushboolean(L, side->lightabsolute);
+		return 1;
+	case side_lightabsolute_top:
+		lua_pushboolean(L, side->lightabsolute_top);
+		return 1;
+	case side_lightabsolute_mid:
+		lua_pushboolean(L, side->lightabsolute_mid);
+		return 1;
+	case side_lightabsolute_bottom:
+		lua_pushboolean(L, side->lightabsolute_bottom);
+		return 1;
+	case side_customargs:
+		LUA_PushUserdata(L, side->customargs, META_SIDECUSTOMARGS);
+		return 1;
 	// TODO: 2.3: Delete
 	case side_text:
 		{
@@ -1330,6 +1373,7 @@ static int side_get(lua_State *L)
 			return 1;
 		}
 	}
+
 	return 0;
 }
 
@@ -1413,6 +1457,30 @@ static int side_set(lua_State *L)
 	case side_repeatcnt:
 		side->repeatcnt = luaL_checkinteger(L, 3);
 		break;
+	case side_light:
+		side->light = luaL_checkinteger(L, 3);
+		break;
+	case side_light_top:
+		side->light_top = luaL_checkinteger(L, 3);
+		break;
+	case side_light_mid:
+		side->light_mid = luaL_checkinteger(L, 3);
+		break;
+	case side_light_bottom:
+		side->light_bottom = luaL_checkinteger(L, 3);
+		break;
+	case side_lightabsolute:
+		side->lightabsolute = luaL_checkboolean(L, 3);
+		break;
+	case side_lightabsolute_top:
+		side->lightabsolute_top = luaL_checkboolean(L, 3);
+		break;
+	case side_lightabsolute_mid:
+		side->lightabsolute_mid = luaL_checkboolean(L, 3);
+		break;
+	case side_lightabsolute_bottom:
+		side->lightabsolute_bottom = luaL_checkboolean(L, 3);
+		break;
 	}
 	return 0;
 }
@@ -1476,246 +1544,6 @@ static int vertex_num(lua_State *L)
 	return 1;
 }
 
-#ifdef HAVE_LUA_SEGS
-
-///////////
-// seg_t //
-///////////
-
-static int seg_get(lua_State *L)
-{
-	seg_t *seg = *((seg_t **)luaL_checkudata(L, 1, META_SEG));
-	enum seg_e field = Lua_optoption(L, 2, seg_valid, seg_fields_ref);
-
-	if (!seg)
-	{
-		if (field == seg_valid) {
-			lua_pushboolean(L, 0);
-			return 1;
-		}
-		return luaL_error(L, "accessed seg_t doesn't exist anymore.");
-	}
-
-	switch(field)
-	{
-	case seg_valid: // valid
-		lua_pushboolean(L, 1);
-		return 1;
-	case seg_v1:
-		LUA_PushUserdata(L, seg->v1, META_VERTEX);
-		return 1;
-	case seg_v2:
-		LUA_PushUserdata(L, seg->v2, META_VERTEX);
-		return 1;
-	case seg_side:
-		lua_pushinteger(L, seg->side);
-		return 1;
-	case seg_offset:
-		lua_pushfixed(L, seg->offset);
-		return 1;
-	case seg_angle:
-		lua_pushangle(L, seg->angle);
-		return 1;
-	case seg_sidedef:
-		LUA_PushUserdata(L, seg->sidedef, META_SIDE);
-		return 1;
-	case seg_linedef:
-		LUA_PushUserdata(L, seg->linedef, META_LINE);
-		return 1;
-	case seg_frontsector:
-		LUA_PushUserdata(L, seg->frontsector, META_SECTOR);
-		return 1;
-	case seg_backsector:
-		LUA_PushUserdata(L, seg->backsector, META_SECTOR);
-		return 1;
-	case seg_polyseg:
-		LUA_PushUserdata(L, seg->polyseg, META_POLYOBJ);
-		return 1;
-	}
-	return 0;
-}
-
-static int seg_num(lua_State *L)
-{
-	seg_t *seg = *((seg_t **)luaL_checkudata(L, 1, META_SEG));
-	lua_pushinteger(L, seg-segs);
-	return 1;
-}
-
-////////////
-// node_t //
-////////////
-
-static int node_get(lua_State *L)
-{
-	node_t *node = *((node_t **)luaL_checkudata(L, 1, META_NODE));
-	enum node_e field = Lua_optoption(L, 2, node_valid, node_fields_ref);
-
-	if (!node)
-	{
-		if (field == node_valid) {
-			lua_pushboolean(L, 0);
-			return 1;
-		}
-		return luaL_error(L, "accessed node_t doesn't exist anymore.");
-	}
-
-	switch(field)
-	{
-	case node_valid: // valid
-		lua_pushboolean(L, 1);
-		return 1;
-	case node_x:
-		lua_pushfixed(L, node->x);
-		return 1;
-	case node_y:
-		lua_pushfixed(L, node->y);
-		return 1;
-	case node_dx:
-		lua_pushfixed(L, node->x);
-		return 1;
-	case node_dy:
-		lua_pushfixed(L, node->x);
-		return 1;
-	case node_bbox:
-		LUA_PushUserdata(L, node->bbox, META_NODEBBOX);
-		return 1;
-	case node_children:
-		LUA_PushUserdata(L, node->children, META_NODECHILDREN);
-		return 1;
-	}
-	return 0;
-}
-
-static int node_num(lua_State *L)
-{
-	node_t *node = *((node_t **)luaL_checkudata(L, 1, META_NODE));
-	lua_pushinteger(L, node-nodes);
-	return 1;
-}
-
-///////////////
-// node.bbox //
-///////////////
-
-/*
-// node.bbox[i][j]: i = 0 or 1, j = 0 1 2 or 3
-// NOTE: 2D arrays are NOT double pointers,
-//       the second bbox will be directly after the first in memory (hence the way the bbox is pushed here)
-// this function handles the [i] part, bbox_get handles the [j] part
-static int nodebbox_get(lua_State *L)
-{
-	fixed_t *bbox = *((fixed_t **)luaL_checkudata(L, 1, META_NODEBBOX));
-	int i;
-	lua_settop(L, 2);
-	if (!lua_isnumber(L, 2))
-	{
-		int field = luaL_checkoption(L, 2, NULL, valid_opt);
-		if (!bbox)
-		{
-			if (field == 0) {
-				lua_pushboolean(L, 0);
-				return 1;
-			}
-			return luaL_error(L, "accessed node_t doesn't exist anymore.");
-		} else if (field == 0) {
-			lua_pushboolean(L, 1);
-			return 1;
-		}
-	}
-
-	i = lua_tointeger(L, 2);
-	if (i < 0 || i > 1)
-		return 0;
-	LUA_PushUserdata(L, bbox + i*4*sizeof(fixed_t), META_BBOX);
-	return 1;
-}
-*/
-static int nodebbox_call(lua_State *L)
-{
-	fixed_t *bbox = *((fixed_t **)luaL_checkudata(L, 1, META_NODEBBOX));
-	int i, j;
-	int n = lua_gettop(L);
-
-	if (!bbox)
-		return luaL_error(L, "accessed node bbox doesn't exist anymore.");
-	if (n < 3)
-		return luaL_error(L, "arguments 2 and/or 3 not given (expected node.bbox(child, coord))");
-	// get child
-	if (!lua_isnumber(L, 2)) {
-		enum nodechild_e field = luaL_checkoption(L, 2, nodechild_opt[0], nodechild_opt);
-		switch (field) {
-			case nodechild_right: i = 0; break;
-			case nodechild_left:  i = 1; break;
-			default:
-				return luaL_error(L, "invalid node child \"%s\".", lua_tostring(L, 2));
-		}
-	}
-	else {
-		i = lua_tointeger(L, 2);
-		if (i < 0 || i > 1)
-			return 0;
-	}
-	// get bbox coord
-	if (!lua_isnumber(L, 3)) {
-		enum bbox_e field = luaL_checkoption(L, 3, bbox_opt[0], bbox_opt);
-		switch (field) {
-			case bbox_top:    j = BOXTOP;    break;
-			case bbox_bottom: j = BOXBOTTOM; break;
-			case bbox_left:   j = BOXLEFT;   break;
-			case bbox_right:  j = BOXRIGHT;  break;
-			default:
-				return luaL_error(L, "invalid bbox coordinate \"%s\".", lua_tostring(L, 3));
-		}
-	}
-	else {
-		j = lua_tointeger(L, 3);
-		if (j < 0 || j > 3)
-			return 0;
-	}
-	lua_pushinteger(L, bbox[i*4 + j]);
-	return 1;
-}
-
-/////////////////////
-// node.children[] //
-/////////////////////
-
-// node.children[i]: i = 0 or 1
-static int nodechildren_get(lua_State *L)
-{
-	UINT16 *children = *((UINT16 **)luaL_checkudata(L, 1, META_NODECHILDREN));
-	int i;
-	lua_settop(L, 2);
-	if (!lua_isnumber(L, 2))
-	{
-		enum nodechild_e field = luaL_checkoption(L, 2, nodechild_opt[0], nodechild_opt);
-		if (!children)
-		{
-			if (field == nodechild_valid) {
-				lua_pushboolean(L, 0);
-				return 1;
-			}
-			return luaL_error(L, "accessed node_t doesn't exist anymore.");
-		} else if (field == nodechild_valid) {
-			lua_pushboolean(L, 1);
-			return 1;
-		} else switch (field) {
-			case nodechild_right: i = 0; break;
-			case nodechild_left:  i = 1; break;
-			default:              return 0;
-		}
-	}
-	else {
-		i = lua_tointeger(L, 2);
-		if (i < 0 || i > 1)
-			return 0;
-	}
-	lua_pushinteger(L, children[i]);
-	return 1;
-}
-#endif
-
 //////////
 // bbox //
 //////////
@@ -1997,113 +1825,6 @@ static int lib_numvertexes(lua_State *L)
 	return 1;
 }
 
-#ifdef HAVE_LUA_SEGS
-
-////////////
-// segs[] //
-////////////
-
-static int lib_iterateSegs(lua_State *L)
-{
-	size_t i = 0;
-	INLEVEL
-	if (lua_gettop(L) < 2)
-		return luaL_error(L, "Don't call segs.iterate() directly, use it as 'for seg in segs.iterate do <block> end'.");
-	lua_settop(L, 2);
-	lua_remove(L, 1); // state is unused.
-	if (!lua_isnil(L, 1))
-		i = (size_t)(*((seg_t **)luaL_checkudata(L, 1, META_SEG)) - segs)+1;
-	if (i < numsegs)
-	{
-		LUA_PushUserdata(L, &segs[i], META_SEG);
-		return 1;
-	}
-	return 0;
-}
-
-static int lib_getSeg(lua_State *L)
-{
-	int field;
-	INLEVEL
-	lua_settop(L, 2);
-	lua_remove(L, 1); // dummy userdata table is unused.
-	if (lua_isnumber(L, 1))
-	{
-		size_t i = lua_tointeger(L, 1);
-		if (i >= numsegs)
-			return 0;
-		LUA_PushUserdata(L, &segs[i], META_SEG);
-		return 1;
-	}
-	field = luaL_checkoption(L, 1, NULL, array_opt);
-	switch(field)
-	{
-	case 0: // iterate
-		lua_pushcfunction(L, lib_iterateSegs);
-		return 1;
-	}
-	return 0;
-}
-
-static int lib_numsegs(lua_State *L)
-{
-	lua_pushinteger(L, numsegs);
-	return 1;
-}
-
-/////////////
-// nodes[] //
-/////////////
-
-static int lib_iterateNodes(lua_State *L)
-{
-	size_t i = 0;
-	INLEVEL
-	if (lua_gettop(L) < 2)
-		return luaL_error(L, "Don't call nodes.iterate() directly, use it as 'for node in nodes.iterate do <block> end'.");
-	lua_settop(L, 2);
-	lua_remove(L, 1); // state is unused.
-	if (!lua_isnil(L, 1))
-		i = (size_t)(*((node_t **)luaL_checkudata(L, 1, META_NODE)) - nodes)+1;
-	if (i < numsegs)
-	{
-		LUA_PushUserdata(L, &nodes[i], META_NODE);
-		return 1;
-	}
-	return 0;
-}
-
-static int lib_getNode(lua_State *L)
-{
-	int field;
-	INLEVEL
-	lua_settop(L, 2);
-	lua_remove(L, 1); // dummy userdata table is unused.
-	if (lua_isnumber(L, 1))
-	{
-		size_t i = lua_tointeger(L, 1);
-		if (i >= numnodes)
-			return 0;
-		LUA_PushUserdata(L, &nodes[i], META_NODE);
-		return 1;
-	}
-	field = luaL_checkoption(L, 1, NULL, array_opt);
-	switch(field)
-	{
-	case 0: // iterate
-		lua_pushcfunction(L, lib_iterateNodes);
-		return 1;
-	}
-	return 0;
-}
-
-static int lib_numnodes(lua_State *L)
-{
-	lua_pushinteger(L, numnodes);
-	return 1;
-}
-#endif
-
 //////////////
 // ffloor_t //
 //////////////
@@ -2648,47 +2369,6 @@ static int slope_set(lua_State *L)
 	return 0;
 }
 
-///////////////
-// vector*_t //
-///////////////
-
-static int vector2_get(lua_State *L)
-{
-	vector2_t *vec = *((vector2_t **)luaL_checkudata(L, 1, META_VECTOR2));
-	enum vector_e field = luaL_checkoption(L, 2, vector_opt[0], vector_opt);
-
-	if (!vec)
-		return luaL_error(L, "accessed vector2_t doesn't exist anymore.");
-
-	switch(field)
-	{
-		case vector_x: lua_pushfixed(L, vec->x); return 1;
-		case vector_y: lua_pushfixed(L, vec->y); return 1;
-		default: break;
-	}
-
-	return 0;
-}
-
-static int vector3_get(lua_State *L)
-{
-	vector3_t *vec = *((vector3_t **)luaL_checkudata(L, 1, META_VECTOR3));
-	enum vector_e field = luaL_checkoption(L, 2, vector_opt[0], vector_opt);
-
-	if (!vec)
-		return luaL_error(L, "accessed vector3_t doesn't exist anymore.");
-
-	switch(field)
-	{
-		case vector_x: lua_pushfixed(L, vec->x); return 1;
-		case vector_y: lua_pushfixed(L, vec->y); return 1;
-		case vector_z: lua_pushfixed(L, vec->z); return 1;
-		default: break;
-	}
-
-	return 0;
-}
-
 /////////////////////
 // mapheaderinfo[] //
 /////////////////////
@@ -2997,18 +2677,20 @@ int LUA_MapLib(lua_State *L)
 	LUA_RegisterUserdataMetatable(L, META_SECTORLINES, sectorlines_get, NULL, sectorlines_num);
 	LUA_RegisterUserdataMetatable(L, META_SECTOR, sector_get, sector_set, sector_num);
 	LUA_RegisterUserdataMetatable(L, META_SUBSECTOR, subsector_get, NULL, subsector_num);
+	LUA_RegisterUserdataMetatable(L, META_SECTORCUSTOMARGS, sectorcustomargs_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_LINE, line_get, NULL, line_num);
 	LUA_RegisterUserdataMetatable(L, META_LINEARGS, lineargs_get, NULL, lineargs_len);
 	LUA_RegisterUserdataMetatable(L, META_LINESTRINGARGS, linestringargs_get, NULL, linestringargs_len);
+	LUA_RegisterUserdataMetatable(L, META_LINECUSTOMARGS, linecustomargs_get, NULL, NULL);
+	LUA_RegisterUserdataMetatable(L, META_SIDECUSTOMARGS, sidecustomargs_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_SIDENUM, sidenum_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_SIDE, side_get, side_set, side_num);
 	LUA_RegisterUserdataMetatable(L, META_VERTEX, vertex_get, NULL, vertex_num);
 	LUA_RegisterUserdataMetatable(L, META_FFLOOR, ffloor_get, ffloor_set, NULL);
 	LUA_RegisterUserdataMetatable(L, META_BBOX, bbox_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_SLOPE, slope_get, slope_set, NULL);
-	LUA_RegisterUserdataMetatable(L, META_VECTOR2, vector2_get, NULL, NULL);
-	LUA_RegisterUserdataMetatable(L, META_VECTOR3, vector3_get, NULL, NULL);
 	LUA_RegisterUserdataMetatable(L, META_MAPHEADER, mapheaderinfo_get, NULL, NULL);
+	LUA_RegisterUserdataMetatable(L, META_THINGCUSTOMARGS, thingcustomargs_get, NULL, NULL);
 
 	sector_fields_ref = Lua_CreateFieldTable(L, sector_opt);
 	subsector_fields_ref = Lua_CreateFieldTable(L, subsector_opt);
@@ -3040,22 +2722,5 @@ int LUA_MapLib(lua_State *L)
 			&numlines, &lines,
 			sizeof (line_t), META_LINE);
 
-#ifdef HAVE_LUA_SEGS
-	LUA_RegisterUserdataMetatable(L, META_SEG, seg_get, NULL, seg_num);
-	LUA_RegisterUserdataMetatable(L, META_NODE, node_get, NULL, node_num);
-	LUA_RegisterUserdataMetatable(L, META_NODECHILDREN, nodechildren_get, NULL, NULL);
-
-	seg_fields_ref = Lua_CreateFieldTable(L, seg_opt);
-	node_fields_ref = Lua_CreateFieldTable(L, node_opt);
-
-	luaL_newmetatable(L, META_NODEBBOX);
-		//LUA_SetCFunctionField(L, "__index", nodebbox_get);
-		LUA_SetCFunctionField(L, "__call", nodebbox_call);
-	lua_pop(L, 1);
-
-	LUA_RegisterGlobalUserdata(L, "segs", lib_getSeg, NULL, lib_numsegs);
-	LUA_RegisterGlobalUserdata(L, "nodes", lib_getNode, NULL, lib_numnodes);
-#endif
-
 	return 0;
 }

src/lua_mathlib.c

@@ -15,7 +15,7 @@
 #include "tables.h"
 #include "p_local.h"
 #include "doomstat.h" // for ALL7EMERALDS
-#include "r_main.h" // for R_PointToDist2
+#include "r_main.h" // for GetDistance2D
 #include "m_easing.h"
 
 #include "lua_script.h"
@@ -144,7 +144,7 @@ static int lib_fixedsqrt(lua_State *L)
 
 static int lib_fixedhypot(lua_State *L)
 {
-	lua_pushfixed(L, R_PointToDist2(0, 0, luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
+	lua_pushfixed(L, GetDistance2D(0, 0, luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
 	return 1;
 }
 
@@ -172,6 +172,109 @@ static int lib_fixedround(lua_State *L)
 	return 1;
 }
 
+// Distance math
+////////////////
+
+static int lib_getdistance2d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t x2 = luaL_checkfixed(L, 3);
+	fixed_t y2 = luaL_checkfixed(L, 4);
+	//HUDSAFE
+	lua_pushfixed(L, GetDistance2D(x1, y1, x2, y2));
+	return 1;
+}
+
+static int lib_getdistance3d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t z1 = luaL_checkfixed(L, 3);
+	fixed_t x2 = luaL_checkfixed(L, 4);
+	fixed_t y2 = luaL_checkfixed(L, 5);
+	fixed_t z2 = luaL_checkfixed(L, 6);
+	//HUDSAFE
+	lua_pushfixed(L, GetDistance3D(x1, y1, z1, x2, y2, z2));
+	return 1;
+}
+
+static int lib_getlargedistance2d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t x2 = luaL_checkfixed(L, 3);
+	fixed_t y2 = luaL_checkfixed(L, 4);
+	//HUDSAFE
+	lua_pushinteger(L, GetLargeDistance2D(x1, y1, x2, y2));
+	return 1;
+}
+
+static int lib_getlargedistance3d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t z1 = luaL_checkfixed(L, 3);
+	fixed_t x2 = luaL_checkfixed(L, 4);
+	fixed_t y2 = luaL_checkfixed(L, 5);
+	fixed_t z2 = luaL_checkfixed(L, 6);
+	//HUDSAFE
+	lua_pushinteger(L, GetLargeDistance3D(x1, y1, z1, x2, y2, z2));
+	return 1;
+}
+
+static int lib_arepointsclose2d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t x2 = luaL_checkfixed(L, 3);
+	fixed_t y2 = luaL_checkfixed(L, 4);
+	fixed_t maxdist = luaL_checkfixed(L, 5);
+	//HUDSAFE
+	lua_pushboolean(L, ArePointsClose2D(x1, y1, x2, y2, maxdist));
+	return 1;
+}
+
+static int lib_arepointsclose3d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t z1 = luaL_checkfixed(L, 3);
+	fixed_t x2 = luaL_checkfixed(L, 4);
+	fixed_t y2 = luaL_checkfixed(L, 5);
+	fixed_t z2 = luaL_checkfixed(L, 6);
+	fixed_t maxdist = luaL_checkfixed(L, 7);
+	//HUDSAFE
+	lua_pushboolean(L, ArePointsClose3D(x1, y1, z1, x2, y2, z2, maxdist));
+	return 1;
+}
+
+static int lib_arepointsfar2d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t x2 = luaL_checkfixed(L, 3);
+	fixed_t y2 = luaL_checkfixed(L, 4);
+	fixed_t mindist = luaL_checkfixed(L, 5);
+	//HUDSAFE
+	lua_pushboolean(L, ArePointsFar2D(x1, y1, x2, y2, mindist));
+	return 1;
+}
+
+static int lib_arepointsfar3d(lua_State *L)
+{
+	fixed_t x1 = luaL_checkfixed(L, 1);
+	fixed_t y1 = luaL_checkfixed(L, 2);
+	fixed_t z1 = luaL_checkfixed(L, 3);
+	fixed_t x2 = luaL_checkfixed(L, 4);
+	fixed_t y2 = luaL_checkfixed(L, 5);
+	fixed_t z2 = luaL_checkfixed(L, 6);
+	fixed_t mindist = luaL_checkfixed(L, 7);
+	//HUDSAFE
+	lua_pushboolean(L, ArePointsFar3D(x1, y1, z1, x2, y2, z2, mindist));
+	return 1;
+}
+
 // Misc. math
 // (aka extra little funcs that don't quite fit in baselib)
 //////////////////////////////////////////////////////////////////
@@ -233,6 +336,14 @@ static luaL_Reg lib_math[] = {
 	{"fixceil"  , lib_fixedceil},
 	{"FixedRound", lib_fixedround},
 	{"fixround"  , lib_fixedround},
+	{"GetDistance2D", lib_getdistance2d},
+	{"GetDistance3D", lib_getdistance3d},
+	{"GetLargeDistance2D", lib_getlargedistance2d},
+	{"GetLargeDistance3D", lib_getlargedistance3d},
+	{"ArePointsClose2D",lib_arepointsclose2d},
+	{"ArePointsClose3D",lib_arepointsclose3d},
+	{"ArePointsFar2D",lib_arepointsfar2d},
+	{"ArePointsFar3D",lib_arepointsfar3d},
 	{"GetSecSpecial", lib_getsecspecial},
 	{"All7Emeralds", lib_all7emeralds},
 	{"ColorOpposite", lib_coloropposite},

src/lua_matrixlib.c

+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by LJ Sonic
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_matrixlib.c
+/// \brief matrix library for Lua scripting
+
+#include "matrix.h"
+#include "vector3d.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+
+static vector3_t *GetVector(lua_State *L, int index)
+{
+	vector3_t *vec = lua_touserdata(L, index);
+
+	if (!vec)
+		return NULL;
+
+	if (!lua_getmetatable(L, index))
+		return NULL;
+
+	lua_getfield(L, LUA_REGISTRYINDEX, META_VECTOR3);
+	if (!lua_rawequal(L, -1, -2))
+		return NULL;
+
+	lua_pop(L, 2);
+
+	return vec;
+}
+
+static void GetVectorOrXYZ(lua_State *L, int index, vector3_t *result)
+{
+	vector3_t *vec = GetVector(L, index);
+	if (vec)
+	{
+		*result = *vec;
+	}
+	else
+	{
+		result->x = luaL_checkfixed(L, 1);
+		result->y = luaL_checkfixed(L, 2);
+		result->z = luaL_checkfixed(L, 3);
+	}
+}
+
+static matrix_t *NewMatrix(lua_State *L)
+{
+	matrix_t *mat = lua_newuserdata(L, sizeof(*mat));
+	luaL_getmetatable(L, META_MATRIX);
+	lua_setmetatable(L, -2);
+	return mat;
+}
+
+////////////////////
+// STATIC MEMBERS //
+////////////////////
+
+static int matrix_new(lua_State *L)
+{
+	Matrix_SetIdentity(NewMatrix(L));
+	return 1;
+}
+
+static int matrix_translation(lua_State *L)
+{
+	vector3_t translation;
+	GetVectorOrXYZ(L, 1, &translation);
+	Matrix_SetTranslation(NewMatrix(L), translation.x, translation.y, translation.z);
+	return 1;
+}
+
+static int matrix_scaling(lua_State *L)
+{
+	vector3_t scaling;
+	GetVectorOrXYZ(L, 1, &scaling);
+	Matrix_SetScaling(NewMatrix(L), scaling.x, scaling.y, scaling.z);
+	return 1;
+}
+
+static luaL_Reg matrix[] = {
+	{"new", matrix_new},
+	{"translation", matrix_translation},
+	{"scaling", matrix_scaling},
+	{NULL, NULL}
+};
+
+/////////////
+// MEMBERS //
+/////////////
+
+enum matrixfield_e {
+	matrixfield_clone = 0,
+	matrixfield_getvalue,
+	matrixfield_setvalue,
+	matrixfield_mulXYZ,
+};
+
+static const char *const matrixfield_opt[] = {
+	"clone",
+	"get",
+	"set",
+	"mulXYZ",
+	NULL};
+
+static int matrix_clone(lua_State *L)
+{
+	matrix_t *mat = luaL_checkudata(L, 1, META_MATRIX);
+	Matrix_Copy(NewMatrix(L), mat);
+	return 1;
+}
+
+static int matrix_getvalue(lua_State *L)
+{
+	matrix_t *mat = luaL_checkudata(L, 1, META_MATRIX);
+	INT32 row = luaL_checkinteger(L, 2);
+	INT32 col = luaL_checkinteger(L, 3);
+
+	if (row < 1 || row > 4)
+		return luaL_error(L, "matrix row %d out of range (1 - 4)", row);
+	if (col < 1 || col > 4)
+		return luaL_error(L, "matrix column %d out of range (1 - 4)", col);
+
+	lua_pushfixed(L, mat->matrix[row - 1][col - 1]);
+	return 1;
+}
+
+static int matrix_setvalue(lua_State *L)
+{
+	matrix_t *mat = luaL_checkudata(L, 1, META_MATRIX);
+	INT32 row = luaL_checkinteger(L, 2);
+	INT32 col = luaL_checkinteger(L, 3);
+	fixed_t value = luaL_checkfixed(L, 4);
+
+	if (row < 1 || row > 4)
+		return luaL_error(L, "matrix row %d out of range (1 - 4)", row);
+	if (col < 1 || col > 4)
+		return luaL_error(L, "matrix column %d out of range (1 - 4)", col);
+
+	mat->matrix[row - 1][col - 1] = value;
+	return 0;
+}
+
+static int matrix_mulXYZ(lua_State *L)
+{
+	matrix_t *mat = luaL_checkudata(L, 1, META_MATRIX);
+	fixed_t x = luaL_checkfixed(L, 2);
+	fixed_t y = luaL_checkfixed(L, 3);
+	fixed_t z = luaL_checkfixed(L, 4);
+
+	vector3_t vec;
+	vector3_t result;
+	Vector3D_Set(&vec, x, y, z);
+	Matrix_MulVector(&result, mat, &vec);
+
+	lua_pushfixed(L, result.x);
+	lua_pushfixed(L, result.y);
+	lua_pushfixed(L, result.z);
+	return 3;
+}
+
+static int matrix_get(lua_State *L)
+{
+	enum matrixfield_e field = luaL_checkoption(L, 2, matrixfield_opt[0], matrixfield_opt);
+
+	switch(field)
+	{
+		case matrixfield_clone: lua_pushcfunction(L, matrix_clone); return 1;
+		case matrixfield_getvalue: lua_pushcfunction(L, matrix_getvalue); return 1;
+		case matrixfield_setvalue: lua_pushcfunction(L, matrix_setvalue); return 1;
+		case matrixfield_mulXYZ: lua_pushcfunction(L, matrix_mulXYZ); return 1;
+
+		default: break;
+	}
+
+	return 0;
+}
+
+///////////////
+// OPERATORS //
+///////////////
+
+static int matrix_mul(lua_State *L)
+{
+	matrix_t *mat1 = luaL_checkudata(L, 1, META_MATRIX);
+
+	vector3_t *vec2 = GetVector(L, 2);
+	if (vec2)
+	{
+		vector3_t *result = lua_newuserdata(L, sizeof(*result));
+		luaL_getmetatable(L, META_VECTOR3);
+		lua_setmetatable(L, -2);
+
+		Matrix_MulVector(result, mat1, vec2);
+	}
+	else
+	{
+		matrix_t *mat2 = luaL_checkudata(L, 2, META_MATRIX);
+		Matrix_Mul(NewMatrix(L), mat1, mat2);
+	}
+
+	return 1;
+}
+
+int LUA_MatrixLib(lua_State *L)
+{
+	luaL_newmetatable(L, META_MATRIX);
+	LUA_SetCFunctionField(L, "__index", matrix_get);
+	LUA_SetCFunctionField(L, "__mul", matrix_mul);
+	lua_pop(L, 1);
+
+	luaL_register(L, "Matrix", matrix);
+	return 0;
+}

src/lua_mobjlib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -69,6 +69,7 @@ enum mobj_e {
 	mobj_color,
 	mobj_translation,
 	mobj_blendmode,
+	mobj_alpha,
 	mobj_bnext,
 	mobj_bprev,
 	mobj_hnext,
@@ -150,6 +151,7 @@ static const char *const mobj_opt[] = {
 	"color",
 	"translation",
 	"blendmode",
+	"alpha",
 	"bnext",
 	"bprev",
 	"hnext",
@@ -196,12 +198,12 @@ static int mobj_get(lua_State *L)
 	enum mobj_e field = Lua_optoption(L, 2, -1, mobj_fields_ref);
 	lua_settop(L, 2);
 
-	if (!mo || !ISINLEVEL) {
+	if (P_MobjWasRemoved(mo) || !ISINLEVEL) {
 		if (field == mobj_valid) {
 			lua_pushboolean(L, 0);
 			return 1;
 		}
-		if (!mo) {
+		if (P_MobjWasRemoved(mo)) {
 			return LUA_ErrInvalid(L, "mobj_t");
 		} else
 			return luaL_error(L, "Do not access an mobj_t field outside a level!");
@@ -354,6 +356,9 @@ static int mobj_get(lua_State *L)
 	case mobj_blendmode:
 		lua_pushinteger(L, mo->blendmode);
 		break;
+	case mobj_alpha:
+		lua_pushfixed(L, mo->alpha);
+		break;
 	case mobj_bnext:
 		if (mo->blocknode && mo->blocknode->bnext) {
 			LUA_PushUserdata(L, mo->blocknode->bnext->mobj, META_MOBJ);
@@ -733,6 +738,16 @@ static int mobj_set(lua_State *L)
 		mo->blendmode = blendmode;
 		break;
 	}
+	case mobj_alpha:
+	{
+		fixed_t alpha = luaL_checkfixed(L, 3);
+		if (alpha < 0)
+			alpha = 0;
+		else if (alpha > FRACUNIT)
+			alpha = FRACUNIT;
+		mo->alpha = alpha;
+		break;
+	}
 	case mobj_bnext:
 		return NOSETPOS;
 	case mobj_bprev:
@@ -958,6 +973,7 @@ enum mapthing_e {
 	mapthing_taglist,
 	mapthing_args,
 	mapthing_stringargs,
+	mapthing_customargs,
 	mapthing_mobj,
 };
 
@@ -979,6 +995,7 @@ const char *const mapthing_opt[] = {
 	"taglist",
 	"args",
 	"stringargs",
+	"customargs",
 	"mobj",
 	NULL,
 };
@@ -1057,6 +1074,9 @@ static int mapthing_get(lua_State *L)
 		case mapthing_stringargs:
 			LUA_PushUserdata(L, mt->stringargs, META_THINGSTRINGARGS);
 			break;
+		case mapthing_customargs:
+			LUA_PushUserdata(L, mt->customargs, META_THINGCUSTOMARGS);
+			break;
 		case mapthing_mobj:
 			LUA_PushUserdata(L, mt->mobj, META_MOBJ);
 			break;

src/lua_playerlib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -37,7 +37,7 @@ static int lib_iteratePlayers(lua_State *L)
 		i = (INT32)(*((player_t **)luaL_checkudata(L, 1, META_PLAYER)) - players);
 	for (i++; i < MAXPLAYERS; i++)
 	{
-		if (!playeringame[i])
+		if (!players[i].ingame)
 			continue;
 		if (!players[i].mo)
 			continue;
@@ -56,7 +56,7 @@ static int lib_getPlayer(lua_State *L)
 		lua_Integer i = luaL_checkinteger(L, 2);
 		if (i < 0 || i >= MAXPLAYERS)
 			return luaL_error(L, "players[] index %d out of range (0 - %d)", i, MAXPLAYERS-1);
-		if (!playeringame[i])
+		if (!players[i].ingame)
 			return 0;
 		if (!players[i].mo)
 			return 0;
@@ -190,6 +190,7 @@ enum player_e
 	player_marelap,
 	player_marebonuslap,
 	player_marebegunat,
+	player_lastmaretime,
 	player_startedtime,
 	player_finishedtime,
 	player_lapbegunat,
@@ -225,6 +226,7 @@ enum player_e
 	player_quittime,
 	player_lastinputtime,
 	player_ping,
+	player_muted,
 	player_fovadd
 };
 
@@ -337,6 +339,7 @@ static const char *const player_opt[] = {
 	"marelap",
 	"marebonuslap",
 	"marebegunat",
+	"lastmaretime",
 	"startedtime",
 	"finishedtime",
 	"lapbegunat",
@@ -372,6 +375,7 @@ static const char *const player_opt[] = {
 	"quittime",
 	"lastinputtime",
 	"ping",
+	"muted",
 	"fovadd",
 	NULL,
 };
@@ -725,6 +729,9 @@ static int player_get(lua_State *L)
 	case player_marebegunat:
 		lua_pushinteger(L, plr->marebegunat);
 		break;
+	case player_lastmaretime:
+		lua_pushinteger(L, plr->lastmaretime);
+		break;
 	case player_startedtime:
 		lua_pushinteger(L, plr->startedtime);
 		break;
@@ -830,6 +837,9 @@ static int player_get(lua_State *L)
 	case player_ping:
 		lua_pushinteger(L, playerpingtable[plr - players]);
 		break;
+	case player_muted:
+		lua_pushboolean(L, plr->muted);
+		break;
 	case player_fovadd:
 		lua_pushfixed(L, plr->fovadd);
 		break;
@@ -1219,6 +1229,9 @@ static int player_set(lua_State *L)
 	case player_marebegunat:
 		plr->marebegunat = (tic_t)luaL_checkinteger(L, 3);
 		break;
+	case player_lastmaretime:
+		plr->lastmaretime = (tic_t)luaL_checkinteger(L, 3);
+		break;
 	case player_startedtime:
 		plr->startedtime = (tic_t)luaL_checkinteger(L, 3);
 		break;
@@ -1351,6 +1364,11 @@ static int player_set(lua_State *L)
 	case player_lastinputtime:
 		plr->lastinputtime = (tic_t)luaL_checkinteger(L, 3);
 		break;
+	case player_ping:
+		return NOSET;
+	case player_muted:
+		plr->muted = lua_toboolean(L, 3);
+		break;
 	case player_fovadd:
 		plr->fovadd = luaL_checkfixed(L, 3);
 		break;

src/lua_quaternionlib.c

+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by LJ Sonic
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_quaternionlib.c
+/// \brief quaternion library for Lua scripting
+
+#include "quaternion.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+
+static quaternion_t *NewQuaternion(lua_State *L)
+{
+	quaternion_t *quat = lua_newuserdata(L, sizeof(*quat));
+	luaL_getmetatable(L, META_QUATERNION);
+	lua_setmetatable(L, -2);
+	return quat;
+}
+
+////////////////////
+// STATIC MEMBERS //
+////////////////////
+
+static int quaternion_new(lua_State *L)
+{
+	Quaternion_SetIdentity(NewQuaternion(L));
+	return 1;
+}
+
+static int quaternion_fromAxisRotation(lua_State *L)
+{
+	vector3_t *axis = luaL_checkudata(L, 1, META_VECTOR3);
+	fixed_t angle = luaL_checkfixed(L, 2);
+	Quaternion_SetAxisRotation(NewQuaternion(L), axis, angle);
+	return 1;
+}
+
+static luaL_Reg quaternion[] = {
+	{"new", quaternion_new},
+	{"fromAxisRotation", quaternion_fromAxisRotation},
+	{NULL, NULL}
+};
+
+/////////////
+// MEMBERS //
+/////////////
+
+static int quaternion_clone(lua_State *L)
+{
+	quaternion_t *quat = luaL_checkudata(L, 1, META_QUATERNION);
+	Quaternion_Copy(NewQuaternion(L), quat);
+	return 1;
+}
+
+static int quaternion_toMatrix(lua_State *L)
+{
+	quaternion_t *quat = luaL_checkudata(L, 1, META_QUATERNION);
+
+	matrix_t *mat = lua_newuserdata(L, sizeof(*mat));
+	luaL_getmetatable(L, META_MATRIX);
+	lua_setmetatable(L, -2);
+
+	Quaternion_ToMatrix(mat, quat);
+	return 1;
+}
+
+enum quaternionfield_e {
+	quaternionfield_clone = 0,
+	quaternionfield_toMatrix,
+	quaternionfield_x,
+	quaternionfield_y,
+	quaternionfield_z,
+	quaternionfield_w,
+};
+
+static const char *const quaternionfield_opt[] = {
+	"clone",
+	"toMatrix",
+	"x",
+	"y",
+	"z",
+	"w",
+	NULL};
+
+static int quaternion_get(lua_State *L)
+{
+	quaternion_t *quat = luaL_checkudata(L, 1, META_QUATERNION);
+	enum quaternionfield_e field = luaL_checkoption(L, 2, quaternionfield_opt[0], quaternionfield_opt);
+
+	switch(field)
+	{
+		case quaternionfield_clone: lua_pushcfunction(L, quaternion_clone); return 1;
+		case quaternionfield_toMatrix: lua_pushcfunction(L, quaternion_toMatrix); return 1;
+
+		case quaternionfield_x: lua_pushfixed(L, quat->x); return 1;
+		case quaternionfield_y: lua_pushfixed(L, quat->y); return 1;
+		case quaternionfield_z: lua_pushfixed(L, quat->z); return 1;
+		case quaternionfield_w: lua_pushfixed(L, quat->w); return 1;
+
+		default: break;
+	}
+
+	return 0;
+}
+
+///////////////
+// OPERATORS //
+///////////////
+
+static int quaternion_mul(lua_State *L)
+{
+	quaternion_t *quat1 = luaL_checkudata(L, 1, META_QUATERNION);
+	quaternion_t *quat2 = luaL_checkudata(L, 2, META_QUATERNION);
+	Quaternion_Mul(NewQuaternion(L), quat1, quat2);
+	return 1;
+}
+
+int LUA_QuaternionLib(lua_State *L)
+{
+	luaL_newmetatable(L, META_QUATERNION);
+	LUA_SetCFunctionField(L, "__index", quaternion_get);
+	LUA_SetCFunctionField(L, "__mul", quaternion_mul);
+	lua_pop(L, 1);
+
+	luaL_register(L, "Quaternion", quaternion);
+	return 0;
+}

src/lua_script.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -20,6 +20,7 @@
 #include "r_state.h"
 #include "r_sky.h"
 #include "g_game.h"
+#include "g_demo.h"
 #include "g_input.h"
 #include "f_finale.h"
 #include "byteptr.h"
@@ -62,6 +63,10 @@ static lua_CFunction liblist[] = {
 	LUA_HudLib, // HUD stuff
 	LUA_ColorLib, // general color functions
 	LUA_InputLib, // inputs
+	LUA_InterceptLib, // intercept_t
+	LUA_VectorLib, // vectors
+	LUA_MatrixLib, // matrices
+	LUA_QuaternionLib, // quaternions
 	NULL
 };
 
@@ -274,6 +279,18 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 	} else if (fastcmp(word,"tutorialmode")) {
 		lua_pushboolean(L, tutorialmode);
 		return 1;
+	} else if (fastcmp(word,"keepcutscene")) {
+		lua_pushboolean(L, keepcutscene);
+		return 1;
+	} else if (fastcmp(word,"nextgametype")) {
+		lua_pushinteger(L, nextgametype);
+		return 1;
+	} else if (fastcmp(word,"skipstats")) {
+		lua_pushinteger(L, skipstats);
+		return 1;
+	} else if (fastcmp(word,"nextmapoverride")) {
+		lua_pushinteger(L, nextmapoverride);
+		return 1;
 	// end map vars
 	// begin CTF colors
 	} else if (fastcmp(word,"skincolor_redteam")) {
@@ -368,17 +385,17 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 		return 1;
 	// local player variables, by popular request
 	} else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
-		if (!addedtogame || consoleplayer < 0 || !playeringame[consoleplayer])
+		if (!addedtogame || consoleplayer < 0 || !players[consoleplayer].ingame)
 			return 0;
 		LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
 		return 1;
 	} else if (fastcmp(word,"displayplayer")) { // player visible on screen (aka display player 1)
-		if (displayplayer < 0 || !playeringame[displayplayer])
+		if (displayplayer < 0 || !players[displayplayer].ingame)
 			return 0;
 		LUA_PushUserdata(L, &players[displayplayer], META_PLAYER);
 		return 1;
 	} else if (fastcmp(word,"secondarydisplayplayer")) { // local/display player 2, for splitscreen
-		if (!splitscreen || secondarydisplayplayer < 0 || !playeringame[secondarydisplayplayer])
+		if (!splitscreen || secondarydisplayplayer < 0 || !players[secondarydisplayplayer].ingame)
 			return 0;
 		LUA_PushUserdata(L, &players[secondarydisplayplayer], META_PLAYER);
 		return 1;
@@ -390,10 +407,26 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 		return 1;
 	// end local player variables
 	} else if (fastcmp(word,"server")) {
-		if ((!multiplayer || !netgame) && !playeringame[serverplayer])
+		if ((!multiplayer || !netgame) && !players[serverplayer].ingame)
 			return 0;
 		LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
 		return 1;
+	// demos booleans
+	} else if (fastcmp(word, "demoplayback")) {
+		lua_pushboolean(L, demoplayback);
+		return 1;
+	} else if (fastcmp(word, "titledemo")) {
+		lua_pushboolean(L, titledemo);
+		return 1;
+	} else if (fastcmp(word, "demorecording")) {
+		lua_pushboolean(L, demorecording);
+		return 1;
+	} else if (fastcmp(word, "timingdemo")) {
+		lua_pushboolean(L, timingdemo);
+		return 1;
+	} else if (fastcmp(word, "demosynced")) {
+		lua_pushboolean(L, demosynced);
+		return 1;
 	} else if (fastcmp(word,"emeralds")) {
 		lua_pushinteger(L, emeralds);
 		return 1;
@@ -412,6 +445,18 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 	} else if (fastcmp(word, "token")) {
 		lua_pushinteger(L, token);
 		return 1;
+	} else if (fastcmp(word, "emblems")) {
+		lua_pushinteger(L, M_CountEmblems(clientGamedata));
+		return 1;
+	} else if (fastcmp(word, "numemblems")) {
+		lua_pushinteger(L, numemblems);
+		return 1;
+	} else if (fastcmp(word, "numextraemblems")) {
+		lua_pushinteger(L, numextraemblems);
+		return 1;
+	} else if (fastcmp(word, "nummaprings")) {
+		lua_pushinteger(L, nummaprings);
+		return 1;
 	} else if (fastcmp(word, "gamestate")) {
 		lua_pushinteger(L, gamestate);
 		return 1;
@@ -437,6 +482,14 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 	} else if (fastcmp(word, "chatactive")) {
 		lua_pushboolean(L, chat_on);
 		return 1;
+	} else if (fastcmp(word, "currentsaveslot")) {
+		if (multiplayer)
+			return 0;
+		lua_pushinteger(L, cursaveslot);
+		return 1;
+	} else if (fastcmp(word, "gamedatafilename")) {
+		lua_pushstring(L, strcmp(timeattackfolder, "main") ? timeattackfolder : "gamedata");
+		return 1;
 	}
 	return 0;
 }
@@ -460,6 +513,8 @@ int LUA_CheckGlobals(lua_State *L, const char *word)
 		emeralds = (UINT16)luaL_checkinteger(L, 2);
 	else if (fastcmp(word, "token"))
 		token = (UINT32)luaL_checkinteger(L, 2);
+	else if (fastcmp(word, "nummaprings"))
+		nummaprings = (INT32)luaL_checkinteger(L, 2);
 	else if (fastcmp(word, "gravity"))
 		gravity = (fixed_t)luaL_checkinteger(L, 2);
 	else if (fastcmp(word, "stoppedclock"))
@@ -622,9 +677,6 @@ static inline boolean LUA_LoadFile(MYFILE *f, char *name)
 	if (!gL) // Lua needs to be initialized
 		LUA_ClearState();
 
-	lua_pushinteger(gL, f->wad);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "WAD");
-
 	lua_pushcfunction(gL, LUA_GetErrorMessage);
 	errorhandlerindex = lua_gettop(gL);
 
@@ -980,16 +1032,6 @@ void LUA_InvalidateLevel(void)
 		LUA_InvalidateUserdata(&slope->o);
 		LUA_InvalidateUserdata(&slope->d);
 	}
-#ifdef HAVE_LUA_SEGS
-	for (i = 0; i < numsegs; i++)
-		LUA_InvalidateUserdata(&segs[i]);
-	for (i = 0; i < numnodes; i++)
-	{
-		LUA_InvalidateUserdata(&nodes[i]);
-		LUA_InvalidateUserdata(nodes[i].bbox);
-		LUA_InvalidateUserdata(nodes[i].children);
-	}
-#endif
 }
 
 void LUA_InvalidateMapthings(void)
@@ -1016,743 +1058,6 @@ void LUA_InvalidatePlayer(player_t *player)
 	LUA_InvalidateUserdata(&player->cmd);
 }
 
-enum
-{
-	ARCH_NULL=0,
-	ARCH_TRUE,
-	ARCH_FALSE,
-	ARCH_INT8,
-	ARCH_INT16,
-	ARCH_INT32,
-	ARCH_SMALLSTRING,
-	ARCH_LARGESTRING,
-	ARCH_TABLE,
-
-	ARCH_MOBJINFO,
-	ARCH_STATE,
-	ARCH_MOBJ,
-	ARCH_PLAYER,
-	ARCH_MAPTHING,
-	ARCH_VERTEX,
-	ARCH_LINE,
-	ARCH_SIDE,
-	ARCH_SUBSECTOR,
-	ARCH_SECTOR,
-#ifdef HAVE_LUA_SEGS
-	ARCH_SEG,
-	ARCH_NODE,
-#endif
-	ARCH_FFLOOR,
-	ARCH_POLYOBJ,
-	ARCH_SLOPE,
-	ARCH_MAPHEADER,
-	ARCH_SKINCOLOR,
-	ARCH_MOUSE,
-	ARCH_SKIN,
-
-	ARCH_TEND=0xFF,
-};
-
-static const struct {
-	const char *meta;
-	UINT8 arch;
-} meta2arch[] = {
-	{META_MOBJINFO, ARCH_MOBJINFO},
-	{META_STATE,    ARCH_STATE},
-	{META_MOBJ,     ARCH_MOBJ},
-	{META_PLAYER,   ARCH_PLAYER},
-	{META_MAPTHING, ARCH_MAPTHING},
-	{META_VERTEX,   ARCH_VERTEX},
-	{META_LINE,     ARCH_LINE},
-	{META_SIDE,     ARCH_SIDE},
-	{META_SUBSECTOR,ARCH_SUBSECTOR},
-	{META_SECTOR,   ARCH_SECTOR},
-#ifdef HAVE_LUA_SEGS
-	{META_SEG,      ARCH_SEG},
-	{META_NODE,     ARCH_NODE},
-#endif
-	{META_FFLOOR,	ARCH_FFLOOR},
-	{META_POLYOBJ,  ARCH_POLYOBJ},
-	{META_SLOPE,    ARCH_SLOPE},
-	{META_MAPHEADER,   ARCH_MAPHEADER},
-	{META_SKINCOLOR,   ARCH_SKINCOLOR},
-	{META_MOUSE,    ARCH_MOUSE},
-	{META_SKIN,     ARCH_SKIN},
-	{NULL,          ARCH_NULL}
-};
-
-static UINT8 GetUserdataArchType(int index)
-{
-	UINT8 i;
-	lua_getmetatable(gL, index);
-
-	for (i = 0; meta2arch[i].meta; i++)
-	{
-		luaL_getmetatable(gL, meta2arch[i].meta);
-		if (lua_rawequal(gL, -1, -2))
-		{
-			lua_pop(gL, 2);
-			return meta2arch[i].arch;
-		}
-		lua_pop(gL, 1);
-	}
-
-	lua_pop(gL, 1);
-	return ARCH_NULL;
-}
-
-static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
-{
-	if (myindex < 0)
-		myindex = lua_gettop(gL)+1+myindex;
-	switch (lua_type(gL, myindex))
-	{
-	case LUA_TNONE:
-	case LUA_TNIL:
-		WRITEUINT8(save_p, ARCH_NULL);
-		break;
-	// This might be a problem. D:
-	case LUA_TLIGHTUSERDATA:
-	case LUA_TTHREAD:
-	case LUA_TFUNCTION:
-		WRITEUINT8(save_p, ARCH_NULL);
-		return 2;
-	case LUA_TBOOLEAN:
-		WRITEUINT8(save_p, lua_toboolean(gL, myindex) ? ARCH_TRUE : ARCH_FALSE);
-		break;
-	case LUA_TNUMBER:
-	{
-		lua_Integer number = lua_tointeger(gL, myindex);
-		if (number >= INT8_MIN && number <= INT8_MAX)
-		{
-			WRITEUINT8(save_p, ARCH_INT8);
-			WRITESINT8(save_p, number);
-		}
-		else if (number >= INT16_MIN && number <= INT16_MAX)
-		{
-			WRITEUINT8(save_p, ARCH_INT16);
-			WRITEINT16(save_p, number);
-		}
-		else
-		{
-			WRITEUINT8(save_p, ARCH_INT32);
-			WRITEFIXED(save_p, number);
-		}
-		break;
-	}
-	case LUA_TSTRING:
-	{
-		UINT32 len = (UINT32)lua_objlen(gL, myindex); // get length of string, including embedded zeros
-		const char *s = lua_tostring(gL, myindex);
-		UINT32 i = 0;
-		// if you're wondering why we're writing a string to save_p this way,
-		// it turns out that Lua can have embedded zeros ('\0') in the strings,
-		// so we can't use WRITESTRING as that cuts off when it finds a '\0'.
-		// Saving the size of the string also allows us to get the size of the string on the other end,
-		// fixing the awful crashes previously encountered for reading strings longer than 1024
-		// (yes I know that's kind of a stupid thing to care about, but it'd be evil to trim or ignore them?)
-		// -- Monster Iestyn 05/08/18
-		if (len < 255)
-		{
-			WRITEUINT8(save_p, ARCH_SMALLSTRING);
-			WRITEUINT8(save_p, len); // save size of string
-		}
-		else
-		{
-			WRITEUINT8(save_p, ARCH_LARGESTRING);
-			WRITEUINT32(save_p, len); // save size of string
-		}
-		while (i < len)
-			WRITECHAR(save_p, s[i++]); // write chars individually, including the embedded zeros
-		break;
-	}
-	case LUA_TTABLE:
-	{
-		boolean found = false;
-		INT32 i;
-		UINT16 t = (UINT16)lua_objlen(gL, TABLESINDEX);
-
-		for (i = 1; i <= t && !found; i++)
-		{
-			lua_rawgeti(gL, TABLESINDEX, i);
-			if (lua_rawequal(gL, myindex, -1))
-			{
-				t = i;
-				found = true;
-			}
-			lua_pop(gL, 1);
-		}
-		if (!found)
-		{
-			t++;
-
-			if (t == 0)
-			{
-				CONS_Alert(CONS_ERROR, "Too many tables to archive!\n");
-				WRITEUINT8(save_p, ARCH_NULL);
-				return 0;
-			}
-		}
-
-		WRITEUINT8(save_p, ARCH_TABLE);
-		WRITEUINT16(save_p, t);
-
-		if (!found)
-		{
-			lua_pushvalue(gL, myindex);
-			lua_rawseti(gL, TABLESINDEX, t);
-			return 1;
-		}
-		break;
-	}
-	case LUA_TUSERDATA:
-		switch (GetUserdataArchType(myindex))
-		{
-		case ARCH_MOBJINFO:
-		{
-			mobjinfo_t *info = *((mobjinfo_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_MOBJINFO);
-			WRITEUINT16(save_p, info - mobjinfo);
-			break;
-		}
-		case ARCH_STATE:
-		{
-			state_t *state = *((state_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_STATE);
-			WRITEUINT16(save_p, state - states);
-			break;
-		}
-		case ARCH_MOBJ:
-		{
-			mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex));
-			if (!mobj)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MOBJ);
-				WRITEUINT32(save_p, mobj->mobjnum);
-			}
-			break;
-		}
-		case ARCH_PLAYER:
-		{
-			player_t *player = *((player_t **)lua_touserdata(gL, myindex));
-			if (!player)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_PLAYER);
-				WRITEUINT8(save_p, player - players);
-			}
-			break;
-		}
-		case ARCH_MAPTHING:
-		{
-			mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex));
-			if (!mapthing)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MAPTHING);
-				WRITEUINT16(save_p, mapthing - mapthings);
-			}
-			break;
-		}
-		case ARCH_VERTEX:
-		{
-			vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex));
-			if (!vertex)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_VERTEX);
-				WRITEUINT16(save_p, vertex - vertexes);
-			}
-			break;
-		}
-		case ARCH_LINE:
-		{
-			line_t *line = *((line_t **)lua_touserdata(gL, myindex));
-			if (!line)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_LINE);
-				WRITEUINT16(save_p, line - lines);
-			}
-			break;
-		}
-		case ARCH_SIDE:
-		{
-			side_t *side = *((side_t **)lua_touserdata(gL, myindex));
-			if (!side)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SIDE);
-				WRITEUINT16(save_p, side - sides);
-			}
-			break;
-		}
-		case ARCH_SUBSECTOR:
-		{
-			subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex));
-			if (!subsector)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SUBSECTOR);
-				WRITEUINT16(save_p, subsector - subsectors);
-			}
-			break;
-		}
-		case ARCH_SECTOR:
-		{
-			sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex));
-			if (!sector)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SECTOR);
-				WRITEUINT16(save_p, sector - sectors);
-			}
-			break;
-		}
-#ifdef HAVE_LUA_SEGS
-		case ARCH_SEG:
-		{
-			seg_t *seg = *((seg_t **)lua_touserdata(gL, myindex));
-			if (!seg)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SEG);
-				WRITEUINT16(save_p, seg - segs);
-			}
-			break;
-		}
-		case ARCH_NODE:
-		{
-			node_t *node = *((node_t **)lua_touserdata(gL, myindex));
-			if (!node)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_NODE);
-				WRITEUINT16(save_p, node - nodes);
-			}
-			break;
-		}
-#endif
-		case ARCH_FFLOOR:
-		{
-			ffloor_t *rover = *((ffloor_t **)lua_touserdata(gL, myindex));
-			if (!rover)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				UINT16 i = P_GetFFloorID(rover);
-				if (i == UINT16_MAX) // invalid ID
-					WRITEUINT8(save_p, ARCH_NULL);
-				else
-				{
-					WRITEUINT8(save_p, ARCH_FFLOOR);
-					WRITEUINT16(save_p, rover->target - sectors);
-					WRITEUINT16(save_p, i);
-				}
-			}
-			break;
-		}
-		case ARCH_POLYOBJ:
-		{
-			polyobj_t *polyobj = *((polyobj_t **)lua_touserdata(gL, myindex));
-			if (!polyobj)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_POLYOBJ);
-				WRITEUINT16(save_p, polyobj-PolyObjects);
-			}
-			break;
-		}
-		case ARCH_SLOPE:
-		{
-			pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
-			if (!slope)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SLOPE);
-				WRITEUINT16(save_p, slope->id);
-			}
-			break;
-		}
-		case ARCH_MAPHEADER:
-		{
-			mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
-			if (!header)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MAPHEADER);
-				WRITEUINT16(save_p, header - *mapheaderinfo);
-			}
-			break;
-		}
-		case ARCH_SKINCOLOR:
-		{
-			skincolor_t *info = *((skincolor_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_SKINCOLOR);
-			WRITEUINT16(save_p, info - skincolors);
-			break;
-		}
-		case ARCH_MOUSE:
-		{
-			mouse_t *m = *((mouse_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_MOUSE);
-			WRITEUINT8(save_p, m == &mouse ? 1 : 2);
-			break;
-		}
-		case ARCH_SKIN:
-		{
-			skin_t *skin = *((skin_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_SKIN);
-			WRITEUINT8(save_p, skin->skinnum); // UINT8 because MAXSKINS must be <= 256
-			break;
-		}
-		default:
-			WRITEUINT8(save_p, ARCH_NULL);
-			return 2;
-		}
-		break;
-	}
-	return 0;
-}
-
-static void ArchiveExtVars(void *pointer, const char *ptype)
-{
-	int TABLESINDEX;
-	UINT16 i;
-
-	if (!gL) {
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(save_p, 0);
-		return;
-	}
-
-	TABLESINDEX = lua_gettop(gL);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, LREG_EXTVARS);
-	I_Assert(lua_istable(gL, -1));
-	lua_pushlightuserdata(gL, pointer);
-	lua_rawget(gL, -2);
-	lua_remove(gL, -2); // pop LREG_EXTVARS
-
-	if (!lua_istable(gL, -1))
-	{ // no extra values table
-		lua_pop(gL, 1);
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(save_p, 0);
-		return;
-	}
-
-	lua_pushnil(gL);
-	for (i = 0; lua_next(gL, -2); i++)
-		lua_pop(gL, 1);
-
-	// skip anything that has an empty table and isn't a player.
-	if (i == 0)
-	{
-		if (fastcmp(ptype,"player")) // always include players even if they have no extra variables
-			WRITEUINT16(save_p, 0);
-		lua_pop(gL, 1);
-		return;
-	}
-
-	if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header
-		WRITEUINT32(save_p, ((mobj_t *)pointer)->mobjnum);
-	WRITEUINT16(save_p, i);
-	lua_pushnil(gL);
-	while (lua_next(gL, -2))
-	{
-		I_Assert(lua_type(gL, -2) == LUA_TSTRING);
-		WRITESTRING(save_p, lua_tostring(gL, -2));
-		if (ArchiveValue(TABLESINDEX, -1) == 2)
-			CONS_Alert(CONS_ERROR, "Type of value for %s entry '%s' (%s) could not be archived!\n", ptype, lua_tostring(gL, -2), luaL_typename(gL, -1));
-		lua_pop(gL, 1);
-	}
-
-	lua_pop(gL, 1);
-}
-
-static int NetArchive(lua_State *L)
-{
-	int TABLESINDEX = lua_upvalueindex(1);
-	int i, n = lua_gettop(L);
-	for (i = 1; i <= n; i++)
-		ArchiveValue(TABLESINDEX, i);
-	return n;
-}
-
-static void ArchiveTables(void)
-{
-	int TABLESINDEX;
-	UINT16 i, n;
-	UINT8 e;
-
-	if (!gL)
-		return;
-
-	TABLESINDEX = lua_gettop(gL);
-
-	n = (UINT16)lua_objlen(gL, TABLESINDEX);
-	for (i = 1; i <= n; i++)
-	{
-		lua_rawgeti(gL, TABLESINDEX, i);
-		lua_pushnil(gL);
-		while (lua_next(gL, -2))
-		{
-			// Write key
-			e = ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
-			if (e == 1)
-				n++; // the table contained a new table we'll have to archive. :(
-			else if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
-				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i);
-
-			// Write value
-			e = ArchiveValue(TABLESINDEX, -1);
-			if (e == 1)
-				n++; // the table contained a new table we'll have to archive. :(
-			else if (e == 2) // invalid value type
-				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1));
-
-			lua_pop(gL, 1);
-		}
-		WRITEUINT8(save_p, ARCH_TEND);
-
-		// Write metatable ID
-		if (lua_getmetatable(gL, -1))
-		{
-			// registry.metatables[metatable]
-			lua_getfield(gL, LUA_REGISTRYINDEX, LREG_METATABLES);
-			lua_pushvalue(gL, -2);
-			lua_gettable(gL, -2);
-			WRITEUINT16(save_p, lua_isnil(gL, -1) ? 0 : lua_tointeger(gL, -1));
-			lua_pop(gL, 3);
-		}
-		else
-			WRITEUINT16(save_p, 0);
-
-		lua_pop(gL, 1);
-	}
-}
-
-static UINT8 UnArchiveValue(int TABLESINDEX)
-{
-	UINT8 type = READUINT8(save_p);
-	switch (type)
-	{
-	case ARCH_NULL:
-		lua_pushnil(gL);
-		break;
-	case ARCH_TRUE:
-		lua_pushboolean(gL, true);
-		break;
-	case ARCH_FALSE:
-		lua_pushboolean(gL, false);
-		break;
-	case ARCH_INT8:
-		lua_pushinteger(gL, READSINT8(save_p));
-		break;
-	case ARCH_INT16:
-		lua_pushinteger(gL, READINT16(save_p));
-		break;
-	case ARCH_INT32:
-		lua_pushinteger(gL, READFIXED(save_p));
-		break;
-	case ARCH_SMALLSTRING:
-	case ARCH_LARGESTRING:
-	{
-		UINT32 len;
-		char *value;
-		UINT32 i = 0;
-
-		// See my comments in the ArchiveValue function;
-		// it's much the same for reading strings as writing them!
-		// (i.e. we can't use READSTRING either)
-		// -- Monster Iestyn 05/08/18
-		if (type == ARCH_SMALLSTRING)
-			len = READUINT8(save_p); // length of string, including embedded zeros
-		else
-			len = READUINT32(save_p); // length of string, including embedded zeros
-		value = malloc(len); // make temp buffer of size len
-		// now read the actual string
-		while (i < len)
-			value[i++] = READCHAR(save_p); // read chars individually, including the embedded zeros
-		lua_pushlstring(gL, value, len); // push the string (note: this function supports embedded zeros)
-		free(value); // free the buffer
-		break;
-	}
-	case ARCH_TABLE:
-	{
-		UINT16 tid = READUINT16(save_p);
-		lua_rawgeti(gL, TABLESINDEX, tid);
-		if (lua_isnil(gL, -1))
-		{
-			lua_pop(gL, 1);
-			lua_newtable(gL);
-			lua_pushvalue(gL, -1);
-			lua_rawseti(gL, TABLESINDEX, tid);
-			return 2;
-		}
-		break;
-	}
-	case ARCH_MOBJINFO:
-		LUA_PushUserdata(gL, &mobjinfo[READUINT16(save_p)], META_MOBJINFO);
-		break;
-	case ARCH_STATE:
-		LUA_PushUserdata(gL, &states[READUINT16(save_p)], META_STATE);
-		break;
-	case ARCH_MOBJ:
-		LUA_PushUserdata(gL, P_FindNewPosition(READUINT32(save_p)), META_MOBJ);
-		break;
-	case ARCH_PLAYER:
-		LUA_PushUserdata(gL, &players[READUINT8(save_p)], META_PLAYER);
-		break;
-	case ARCH_MAPTHING:
-		LUA_PushUserdata(gL, &mapthings[READUINT16(save_p)], META_MAPTHING);
-		break;
-	case ARCH_VERTEX:
-		LUA_PushUserdata(gL, &vertexes[READUINT16(save_p)], META_VERTEX);
-		break;
-	case ARCH_LINE:
-		LUA_PushUserdata(gL, &lines[READUINT16(save_p)], META_LINE);
-		break;
-	case ARCH_SIDE:
-		LUA_PushUserdata(gL, &sides[READUINT16(save_p)], META_SIDE);
-		break;
-	case ARCH_SUBSECTOR:
-		LUA_PushUserdata(gL, &subsectors[READUINT16(save_p)], META_SUBSECTOR);
-		break;
-	case ARCH_SECTOR:
-		LUA_PushUserdata(gL, &sectors[READUINT16(save_p)], META_SECTOR);
-		break;
-#ifdef HAVE_LUA_SEGS
-	case ARCH_SEG:
-		LUA_PushUserdata(gL, &segs[READUINT16(save_p)], META_SEG);
-		break;
-	case ARCH_NODE:
-		LUA_PushUserdata(gL, &nodes[READUINT16(save_p)], META_NODE);
-		break;
-#endif
-	case ARCH_FFLOOR:
-	{
-		sector_t *sector = &sectors[READUINT16(save_p)];
-		UINT16 id = READUINT16(save_p);
-		ffloor_t *rover = P_GetFFloorByID(sector, id);
-		if (rover)
-			LUA_PushUserdata(gL, rover, META_FFLOOR);
-		break;
-	}
-	case ARCH_POLYOBJ:
-		LUA_PushUserdata(gL, &PolyObjects[READUINT16(save_p)], META_POLYOBJ);
-		break;
-	case ARCH_SLOPE:
-		LUA_PushUserdata(gL, P_SlopeById(READUINT16(save_p)), META_SLOPE);
-		break;
-	case ARCH_MAPHEADER:
-		LUA_PushUserdata(gL, mapheaderinfo[READUINT16(save_p)], META_MAPHEADER);
-		break;
-	case ARCH_SKINCOLOR:
-		LUA_PushUserdata(gL, &skincolors[READUINT16(save_p)], META_SKINCOLOR);
-		break;
-	case ARCH_MOUSE:
-		LUA_PushUserdata(gL, READUINT16(save_p) == 1 ? &mouse : &mouse2, META_MOUSE);
-		break;
-	case ARCH_SKIN:
-		LUA_PushUserdata(gL, skins[READUINT8(save_p)], META_SKIN);
-		break;
-	case ARCH_TEND:
-		return 1;
-	}
-	return 0;
-}
-
-static void UnArchiveExtVars(void *pointer)
-{
-	int TABLESINDEX;
-	UINT16 field_count = READUINT16(save_p);
-	UINT16 i;
-	char field[1024];
-
-	if (field_count == 0)
-		return;
-	I_Assert(gL != NULL);
-
-	TABLESINDEX = lua_gettop(gL);
-	lua_createtable(gL, 0, field_count); // pointer's ext vars subtable
-
-	for (i = 0; i < field_count; i++)
-	{
-		READSTRING(save_p, field);
-		UnArchiveValue(TABLESINDEX);
-		lua_setfield(gL, -2, field);
-	}
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, LREG_EXTVARS);
-	I_Assert(lua_istable(gL, -1));
-	lua_pushlightuserdata(gL, pointer);
-	lua_pushvalue(gL, -3); // pointer's ext vars subtable
-	lua_rawset(gL, -3);
-	lua_pop(gL, 2); // pop LREG_EXTVARS and pointer's subtable
-}
-
-static int NetUnArchive(lua_State *L)
-{
-	int TABLESINDEX = lua_upvalueindex(1);
-	int i, n = lua_gettop(L);
-	for (i = 1; i <= n; i++)
-		UnArchiveValue(TABLESINDEX);
-	return n;
-}
-
-static void UnArchiveTables(void)
-{
-	int TABLESINDEX;
-	UINT16 i, n;
-	UINT16 metatableid;
-
-	if (!gL)
-		return;
-
-	TABLESINDEX = lua_gettop(gL);
-
-	n = (UINT16)lua_objlen(gL, TABLESINDEX);
-	for (i = 1; i <= n; i++)
-	{
-		lua_rawgeti(gL, TABLESINDEX, i);
-		while (true)
-		{
-			UINT8 e = UnArchiveValue(TABLESINDEX); // read key
-			if (e == 1) // End of table
-				break;
-			else if (e == 2) // Key contains a new table
-				n++;
-
-			if (UnArchiveValue(TABLESINDEX) == 2) // read value
-				n++;
-
-			if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved)
-			{
-				CONS_Alert(CONS_ERROR, "A nil key in table %d was found! (Invalid key type or corrupted save?)\n", i);
-				lua_pop(gL, 2); // pop key and value instead of setting them in the table, to prevent Lua panic errors
-			}
-			else
-				lua_rawset(gL, -3);
-		}
-
-		metatableid = READUINT16(save_p);
-		if (metatableid)
-		{
-			// setmetatable(table, registry.metatables[metatableid])
-			lua_getfield(gL, LUA_REGISTRYINDEX, LREG_METATABLES);
-				lua_rawgeti(gL, -1, metatableid);
-				if (lua_isnil(gL, -1))
-					I_Error("Unknown metatable ID %d\n", metatableid);
-				lua_setmetatable(gL, -3);
-			lua_pop(gL, 1);
-		}
-
-		lua_pop(gL, 1);
-	}
-}
-
 void LUA_Step(void)
 {
 	if (!gL)
@@ -1761,76 +1066,6 @@ void LUA_Step(void)
 	lua_gc(gL, LUA_GCSTEP, 1);
 }
 
-void LUA_Archive(void)
-{
-	INT32 i;
-	thinker_t *th;
-
-	if (gL)
-		lua_newtable(gL); // tables to be archived.
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] && i > 0) // dedicated servers...
-			continue;
-		// all players in game will be archived, even if they just add a 0.
-		ArchiveExtVars(&players[i], "player");
-	}
-
-	for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
-	{
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
-
-		// archive function will determine when to skip mobjs,
-		// and write mobjnum in otherwise.
-		ArchiveExtVars(th, "mobj");
-	}
-
-	WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
-
-	LUA_HookNetArchive(NetArchive); // call the NetArchive hook in archive mode
-	ArchiveTables();
-
-	if (gL)
-		lua_pop(gL, 1); // pop tables
-}
-
-void LUA_UnArchive(void)
-{
-	UINT32 mobjnum;
-	INT32 i;
-	thinker_t *th;
-
-	if (gL)
-		lua_newtable(gL); // tables to be read
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] && i > 0) // dedicated servers...
-			continue;
-		UnArchiveExtVars(&players[i]);
-	}
-
-	do {
-		mobjnum = READUINT32(save_p); // read a mobjnum
-		for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
-		{
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-				continue;
-			if (((mobj_t *)th)->mobjnum != mobjnum) // find matching mobj
-				continue;
-			UnArchiveExtVars(th); // apply variables
-		}
-	} while(mobjnum != UINT32_MAX); // repeat until end of mobjs marker.
-
-	LUA_HookNetArchive(NetUnArchive); // call the NetArchive hook in unarchive mode
-	UnArchiveTables();
-
-	if (gL)
-		lua_pop(gL, 1); // pop tables
-}
-
 // For mobj_t, player_t, etc. to take custom variables.
 int Lua_optoption(lua_State *L, int narg, int def, int list_ref)
 {

src/lua_script.h

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2023 by Sonic Team Junior.
+// Copyright (C) 2012-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -13,6 +13,7 @@
 #ifndef LUA_SCRIPT_H
 #define LUA_SCRIPT_H
 
+#include "p_saveg.h"
 #include "m_fixed.h"
 #include "doomtype.h"
 #include "d_player.h"
@@ -29,7 +30,9 @@
 // fixed_t casting
 // TODO add some distinction between fixed numbers and integer numbers
 // for at least the purpose of printing and maybe math.
+#define lua_tofixed(L, i) lua_tointeger(L, i)
 #define luaL_checkfixed(L, i) luaL_checkinteger(L, i)
+#define luaL_optfixed(L, i, d) luaL_optinteger(L, i, d)
 #define lua_pushfixed(L, f) lua_pushinteger(L, f)
 
 // angle_t casting
@@ -52,15 +55,12 @@ void LUA_DumpFile(const char *filename);
 #endif
 fixed_t LUA_EvalMath(const char *word);
 void LUA_Step(void);
-void LUA_Archive(void);
-void LUA_UnArchive(void);
 int LUA_PushGlobals(lua_State *L, const char *word);
 int LUA_CheckGlobals(lua_State *L, const char *word);
 void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
 void LUA_CVarChanged(void *cvar); // lua_consolelib.c
 int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
-void LUA_HookNetArchive(lua_CFunction archFunc);
 
 void LUA_PushTaggableObjectArray
 (		lua_State *L,
@@ -162,9 +162,6 @@ void COM_Lua_f(void);
 	}\
 }
 
-// uncomment if you want seg_t/node_t in Lua
-// #define HAVE_LUA_SEGS
-
 #define ISINLEVEL \
 	(gamestate == GS_LEVEL || titlemapinaction)
 

src/lua_skinlib.c

 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2023 by Sonic Team Junior.
+// Copyright (C) 2014-2025 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -54,7 +54,8 @@ enum skin {
 	skin_contspeed,
 	skin_contangle,
 	skin_soundsid,
-	skin_sprites,
+	skin_sprites, // TODO: 2.3: Delete
+	skin_skinsprites,
 	skin_supersprites,
 	skin_natkcolor
 };
@@ -95,7 +96,8 @@ static const char *const skin_opt[] = {
 	"contspeed",
 	"contangle",
 	"soundsid",
-	"sprites",
+	"sprites", // TODO: 2.3: Delete
+	"skinsprites",
 	"supersprites",
 	"natkcolor",
 	NULL};
@@ -219,7 +221,10 @@ static int skin_get(lua_State *L)
 	case skin_soundsid:
 		LUA_PushUserdata(L, skin->soundsid, META_SOUNDSID);
 		break;
-	case skin_sprites:
+	case skin_sprites: // TODO: 2.3: Delete
+		LUA_PushUserdata(L, skin->sprites_compat, META_SKINSPRITESCOMPAT);
+		break;
+	case skin_skinsprites:
 		LUA_PushUserdata(L, skin->sprites, META_SKINSPRITES);
 		break;
 	case skin_supersprites:
@@ -338,15 +343,7 @@ static int soundsid_num(lua_State *L)
 	return 1;
 }
 
-enum spritesopt {
-	numframes = 0
-};
-
-static const char *const sprites_opt[] = {
-	"numframes",
-	NULL};
-
-// skin.sprites[i] -> sprites[i]
+// skin.skinsprites[i] -> sprites[i]
 static int lib_getSkinSprite(lua_State *L)
 {
 	spritedef_t *sksprites = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITES);
@@ -359,13 +356,46 @@ static int lib_getSkinSprite(lua_State *L)
 	return 1;
 }
 
-// #skin.sprites -> NUMPLAYERSPRITES
+// #skin.skinsprites -> NUMPLAYERSPRITES
 static int lib_numSkinsSprites(lua_State *L)
 {
 	lua_pushinteger(L, NUMPLAYERSPRITES);
 	return 1;
 }
 
+// TODO: 2.3: Delete
+// skin.sprites[i] -> sprites[i]
+static int lib_getSkinSpriteCompat(lua_State *L)
+{
+	spritedef_t *sksprites = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITESCOMPAT);
+	INT32 i = luaL_checkinteger(L, 2) & (SPR2F_MASK | SPR2F_SUPER);
+
+	if (i & SPR2F_SUPER)
+		i = (i & ~SPR2F_SUPER) + NUMPLAYERSPRITES;
+
+	if (i < 0 || i >= NUMPLAYERSPRITES*2)
+		return luaL_error(L, "skin sprites index %d out of range (0 - %d)", i, (NUMPLAYERSPRITES*2)-1);
+
+	LUA_PushUserdata(L, &sksprites[i], META_SKINSPRITESLIST);
+	return 1;
+}
+
+// TODO: 2.3: Delete
+// #skin.sprites -> NUMPLAYERSPRITES*2
+static int lib_numSkinsSpritesCompat(lua_State *L)
+{
+	lua_pushinteger(L, NUMPLAYERSPRITES*2);
+	return 1;
+}
+
+enum spritesopt {
+	numframes = 0
+};
+
+static const char *const sprites_opt[] = {
+	"numframes",
+	NULL};
+
 static int sprite_get(lua_State *L)
 {
 	spritedef_t *sprite = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITESLIST);
@@ -387,6 +417,7 @@ int LUA_SkinLib(lua_State *L)
 	LUA_RegisterUserdataMetatable(L, META_SOUNDSID, soundsid_get, NULL, soundsid_num);
 	LUA_RegisterUserdataMetatable(L, META_SKINSPRITES, lib_getSkinSprite, NULL, lib_numSkinsSprites);
 	LUA_RegisterUserdataMetatable(L, META_SKINSPRITESLIST, sprite_get, NULL, NULL);
+	LUA_RegisterUserdataMetatable(L, META_SKINSPRITESCOMPAT, lib_getSkinSpriteCompat, NULL, lib_numSkinsSpritesCompat); // TODO: 2.3: Delete
 
 	skin_fields_ref = Lua_CreateFieldTable(L, skin_opt);
 

src/lua_thinkerlib.c

@@ -44,7 +44,7 @@ static int iterationState_gc(lua_State *L)
 }
 
 #define push_thinker(th) {\
-	if ((th)->function.acp1 == (actionf_p1)P_MobjThinker) \
+	if ((th)->function == (actionf_p1)P_MobjThinker) \
 		LUA_PushUserdata(L, (th), META_MOBJ); \
 	else \
 		lua_pushlightuserdata(L, (th)); \
@@ -93,7 +93,7 @@ static int lib_iterateThinkers(lua_State *L)
 		return luaL_error(L, "next thinker invalidated during iteration");
 
 	for (; next != &thlist[THINK_MOBJ]; next = next->next)
-		if (!it->filter || next->function.acp1 == it->filter)
+		if (!it->filter || next->function == it->filter)
 		{
 			push_thinker(next);
 			if (next->next != &thlist[THINK_MOBJ])

src/lua_vectorlib.c

+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by LJ Sonic
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  lua_vectorlib.c
+/// \brief vector library for Lua scripting
+
+#include "vector3d.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+
+// shared by both Vector2D and Vector3D
+enum vectorfield_e {
+	vectorfield_clone = 0,
+	vectorfield_opposite,
+	vectorfield_x,
+	vectorfield_y,
+	vectorfield_z,
+	vectorfield_length,
+	vectorfield_normalized,
+};
+
+static const char *const vectorfield_opt[] = {
+	"vector_clone",
+	"vector_opposite",
+	"x",
+	"y",
+	"z",
+	"vector_length",
+	"vector_normalized",
+	NULL};
+
+////////////////////////////
+// VECTOR2 STATIC MEMBERS //
+////////////////////////////
+
+/////////////////////
+// VECTOR2 MEMBERS //
+/////////////////////
+
+static int vector2d_get(lua_State *L)
+{
+	vector2_t *vec = *((vector2_t **)luaL_checkudata(L, 1, META_VECTOR2));
+	enum vectorfield_e field = luaL_checkoption(L, 2, vectorfield_opt[0], vectorfield_opt);
+
+	switch(field)
+	{
+		case vectorfield_x: lua_pushfixed(L, vec->x); return 1;
+		case vectorfield_y: lua_pushfixed(L, vec->y); return 1;
+		default: break;
+	}
+
+	return 0;
+}
+
+/////////////
+// VECTOR3 //
+/////////////
+
+static vector3_t *NewVector3(lua_State *L)
+{
+	vector3_t *vec = lua_newuserdata(L, sizeof(*vec));
+	luaL_getmetatable(L, META_VECTOR3);
+	lua_setmetatable(L, -2);
+	return vec;
+}
+
+////////////////////////////
+// VECTOR3 STATIC MEMBERS //
+////////////////////////////
+
+static int vector3d_new(lua_State *L)
+{
+	fixed_t x = luaL_checkfixed(L, 1);
+	fixed_t y = luaL_checkfixed(L, 2);
+	fixed_t z = luaL_optfixed(L, 3, 0);
+
+	Vector3D_Set(NewVector3(L), x, y, z);
+	return 1;
+}
+
+static luaL_Reg vector3d[] = {
+	{"new", vector3d_new},
+	{NULL, NULL}
+};
+
+/////////////////////
+// VECTOR3 MEMBERS //
+/////////////////////
+
+static int vector3d_clone(lua_State *L)
+{
+	vector3_t *vec = luaL_checkudata(L, 1, META_VECTOR3);
+	Vector3D_Copy(NewVector3(L), vec);
+	return 1;
+}
+
+static int vector3d_opposite(lua_State *L)
+{
+	vector3_t *vec = luaL_checkudata(L, 1, META_VECTOR3);
+	Vector3D_Opposite(NewVector3(L), vec);
+	return 1;
+}
+
+static int vector3d_get(lua_State *L)
+{
+	vector3_t *vec = luaL_checkudata(L, 1, META_VECTOR3);
+	enum vectorfield_e field = luaL_checkoption(L, 2, vectorfield_opt[0], vectorfield_opt);
+
+	if (!vec)
+		return luaL_error(L, "accessed vector3_t doesn't exist anymore.");
+
+	switch(field)
+	{
+		case vectorfield_clone: lua_pushcfunction(L, vector3d_clone); return 1;
+		case vectorfield_opposite: lua_pushcfunction(L, vector3d_opposite); return 1;
+
+		case vectorfield_x: lua_pushfixed(L, vec->x); return 1;
+		case vectorfield_y: lua_pushfixed(L, vec->y); return 1;
+		case vectorfield_z: lua_pushfixed(L, vec->z); return 1;
+		case vectorfield_length: lua_pushfixed(L, Vector3D_Length(vec)); return 1;
+		case vectorfield_normalized: Vector3D_Normalize(NewVector3(L), vec); return 1;
+
+		default: break;
+	}
+
+	return 0;
+}
+
+///////////////////////
+// VECTOR3 OPERATORS //
+///////////////////////
+
+static int vector3d_eq(lua_State *L)
+{
+	vector3_t *vec1 = luaL_checkudata(L, 1, META_VECTOR3);
+	vector3_t *vec2 = luaL_checkudata(L, 2, META_VECTOR3);
+	lua_pushboolean(L, Vector3D_Equal(vec1, vec2));
+	return 1;
+}
+
+static int vector3d_op(
+	lua_State *L,
+	vector3_t *(*opvector)(vector3_t*, vector3_t*, vector3_t*),
+	vector3_t *(*opfixed)(vector3_t*, vector3_t*, fixed_t)
+)
+{
+	if (lua_isnumber(L, 1) && (opfixed == Vector3D_AddFixed || opfixed == Vector3D_MulFixed))
+	{
+		fixed_t n1 = lua_tofixed(L, 1);
+		vector3_t *vec2 = luaL_checkudata(L, 2, META_VECTOR3);
+		opfixed(NewVector3(L), vec2, n1);
+	}
+	else if (lua_isnumber(L, 2))
+	{
+		vector3_t *vec1 = luaL_checkudata(L, 1, META_VECTOR3);
+		fixed_t n2 = lua_tofixed(L, 2);
+		opfixed(NewVector3(L), vec1, n2);
+	}
+	else
+	{
+		vector3_t *vec1 = luaL_checkudata(L, 1, META_VECTOR3);
+		vector3_t *vec2 = luaL_checkudata(L, 2, META_VECTOR3);
+		opvector(NewVector3(L), vec1, vec2);
+	}
+
+	return 1;
+}
+
+static int vector3d_add(lua_State *L)
+{
+	return vector3d_op(L, Vector3D_Add, Vector3D_AddFixed);
+}
+
+static int vector3d_sub(lua_State *L)
+{
+	return vector3d_op(L, Vector3D_Sub, Vector3D_SubFixed);
+}
+
+static int vector3d_mul(lua_State *L)
+{
+	return vector3d_op(L, Vector3D_Mul, Vector3D_MulFixed);
+}
+
+static int vector3d_div(lua_State *L)
+{
+	return vector3d_op(L, Vector3D_Div, Vector3D_DivFixed);
+}
+
+static int vector3d_unm(lua_State *L)
+{
+	vector3_t *vec = luaL_checkudata(L, 1, META_VECTOR3);
+	Vector3D_Opposite(NewVector3(L), vec);
+	return 1;
+}
+
+int LUA_VectorLib(lua_State *L)
+{
+	LUA_RegisterUserdataMetatable(L, META_VECTOR2, vector2d_get, NULL, NULL);
+
+	luaL_newmetatable(L, META_VECTOR3);
+	LUA_SetCFunctionField(L, "__index", vector3d_get);
+	LUA_SetCFunctionField(L, "__eq", vector3d_eq);
+	LUA_SetCFunctionField(L, "__add", vector3d_add);
+	LUA_SetCFunctionField(L, "__sub", vector3d_sub);
+	LUA_SetCFunctionField(L, "__mul", vector3d_mul);
+	LUA_SetCFunctionField(L, "__div", vector3d_div);
+	LUA_SetCFunctionField(L, "__unm", vector3d_unm);
+	lua_pop(L, 1);
+
+	luaL_register(L, "Vector3D", vector3d);
+	return 0;
+}