From 882e225d5a822c7edca0c3b218f85a455fd7d623 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 21 May 2016 09:23:52 +0200 Subject: [PATCH] More syntax highlighting updates --- Build/Scripting/Lua.cfg | 39 +++++++++++++++++++++++++++++++++++---- Build/Scripting/SOC.cfg | 20 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/Build/Scripting/Lua.cfg b/Build/Scripting/Lua.cfg index e26f9dd..699ebc3 100644 --- a/Build/Scripting/Lua.cfg +++ b/Build/Scripting/Lua.cfg @@ -80,10 +80,13 @@ keywords All7Emeralds = "int flags"; ColorOpposite = "int color"; // p_random - P_Random = ""; - P_SignedRandom = ""; + P_RandomFixed = ""; + P_RandomByte = ""; P_RandomKey = "int a"; P_RandomRange = "int a, int b"; + P_Random = ""; + P_SignedRandom = ""; + P_RandomChance = "fixed p"; // p_maputil P_AproxDistance = "fixed dx, fixed dy"; P_ClosestPointOnLine = "fixed x, fixed y, line_t line"; @@ -207,7 +210,7 @@ keywords S_StartSound = "mobj_t origin, int soundnum, [player_t player]"; S_StartSoundAtVolume = "mobj_t origin, int soundnum, int volume, [player_t player]"; S_StopSound = "mobj_t origin"; - S_ChangeMusic = "int musicnum, [boolean looping?], [player_t player]"; + S_ChangeMusic = "string musicname, [boolean looping?], [player_t player], [int tracknum]"; S_SpeedMusic = "fixed musicspeed, [player_t player]"; S_StopMusic = "[player_t player]"; S_OriginPlaying = "mobj_t origin"; @@ -258,6 +261,12 @@ keywords patchExists = "string name"; cachePatch = "string name"; stringWidth = "string string, [int flags, [string widthtype]]"; + getColormap = "[string/int skin, int color]"; + width = ""; + height = ""; + dupx = ""; + dupy = ""; + renderer = ""; // basic Lua assert = "boolean assert, [string errormsg]"; collectgarbage = "[string opt, [string arg]]"; @@ -517,11 +526,13 @@ constants globalweather; levelskynum; globallevelskynum; - mapmusic; + mapmusicname; + mapmusicflags; server; admin; emeralds; gravity; + VERSIONSTRING; // tables sprnames; states; @@ -593,6 +604,8 @@ constants PUSHACCEL; MODID; CODEBASE; + VERSION; + SUBVERSION; FLOATSPEED; MAXSTEPMOVE; USERANGE; @@ -1128,6 +1141,8 @@ constants MFE_JUSTSTEPPEDDOWN; MFE_VERTICALFLIP; MFE_GOOWATER; + MFE_SPRUNG; + MFE_APPLYMOMZ; // thing flags MTF_OBJECTFLIP; MTF_OBJECTSPECIAL; @@ -4331,7 +4346,23 @@ constants SKINCOLOR_OLIVE; SKINCOLOR_YELLOW; SKINCOLOR_GOLD; + SKINCOLOR_SUPER1; + SKINCOLOR_SUPER2; + SKINCOLOR_SUPER3; + SKINCOLOR_SUPER4; + SKINCOLOR_SUPER5; + SKINCOLOR_TSUPER1; + SKINCOLOR_TSUPER2; + SKINCOLOR_TSUPER3; + SKINCOLOR_TSUPER4; + SKINCOLOR_TSUPER5; + SKINCOLOR_KSUPER1; + SKINCOLOR_KSUPER2; + SKINCOLOR_KSUPER3; + SKINCOLOR_KSUPER4; + SKINCOLOR_KSUPER5; MAXSKINCOLORS; + MAXTRANSLATIONS; // directions DI_NODIR; DI_EAST; diff --git a/Build/Scripting/SOC.cfg b/Build/Scripting/SOC.cfg index ec15f4a..90f2549 100644 --- a/Build/Scripting/SOC.cfg +++ b/Build/Scripting/SOC.cfg @@ -582,6 +582,8 @@ constants PUSHACCEL; MODID; CODEBASE; + VERSION; + SUBVERSION; FLOATSPEED; MAXSTEPMOVE; USERANGE; @@ -1117,6 +1119,8 @@ constants MFE_JUSTSTEPPEDDOWN; MFE_VERTICALFLIP; MFE_GOOWATER; + MFE_SPRUNG; + MFE_APPLYMOMZ; // thing flags MTF_OBJECTFLIP; MTF_OBJECTSPECIAL; @@ -4320,7 +4324,23 @@ constants SKINCOLOR_OLIVE; SKINCOLOR_YELLOW; SKINCOLOR_GOLD; + SKINCOLOR_SUPER1; + SKINCOLOR_SUPER2; + SKINCOLOR_SUPER3; + SKINCOLOR_SUPER4; + SKINCOLOR_SUPER5; + SKINCOLOR_TSUPER1; + SKINCOLOR_TSUPER2; + SKINCOLOR_TSUPER3; + SKINCOLOR_TSUPER4; + SKINCOLOR_TSUPER5; + SKINCOLOR_KSUPER1; + SKINCOLOR_KSUPER2; + SKINCOLOR_KSUPER3; + SKINCOLOR_KSUPER4; + SKINCOLOR_KSUPER5; MAXSKINCOLORS; + MAXTRANSLATIONS; // directions DI_NODIR; DI_EAST;