diff --git a/dist/res/config/languages/decorate.txt b/dist/res/config/languages/decorate.txt index 4c6956b38..6dde0ad41 100644 --- a/dist/res/config/languages/decorate.txt +++ b/dist/res/config/languages/decorate.txt @@ -49,7 +49,7 @@ decorate : cstyle { // Physics Gravity, Mass, Radius, Height, BounceFactor, BounceCount, BounceType, WallBounceFactor, PushFactor, DeathHeight, BurnHeight, ProjectilePassHeight, CameraHeight, MaxStepHeight, MaxDropOffHeight, - Speed, VSpeed, FastSpeed, FloatSpeed, Friction, MaxSlopeSteepness, ThruBits, + Speed, VSpeed, FastSpeed, FloatSpeed, Friction, MaxSlopeSteepness, ThruBits, LandingSpeed, // Rendering RenderStyle, None, Normal, Fuzzy, OptFuzzy, Translucent, SoulTrans, Stencil, AddStencil, StencilColor, Shaded, @@ -98,7 +98,7 @@ decorate : cstyle { BlueMap, GoldMap, GreenMap, InverseMap, RedMap, // Morph powerup - PowerMorph, PlayerClass, MorphStyle, MorphFlash, UnmorphFlash, + PowerMorph, PlayerClass, MorphStyle, MorphFlash, UnmorphFlash, MonsterClass, // Morph projectile MorphProjectile, PlayerClass, MonsterClass, Duration, MorphStyle, MorphFlash, UnmorphFlash, @@ -118,6 +118,9 @@ decorate : cstyle { // Puzzle items PuzzleItem, Number, FailMessage, FailSound, + // Spectator camera + SpectatorCamera, ChaseMode, ChasingTracer, LagDistance, + // Combos Monster, Projectile, @@ -177,7 +180,7 @@ decorate : cstyle { E3M8BOSS, E4M6BOSS, E4M8BOSS, MAP07BOSS1, MAP07BOSS2, HIGHERMPROB, DONTFOLLOWPLAYERS, SEEFRIENDLYMONSTERS, ADDLIGHTLEVEL, CROSSLINECHECK, MASTERNOSEE, INVISIBLEINMIRRORS, ONLYVISIBLEINMIRRORS, ONLYSLAMSOLID, SHADOWAIM, DOSHADOWBLOCK, SHADOWBLOCK, SHADOWAIMVERT, NOSAVEGAME, DECOUPLEDANIMATIONS, BILLBOARDFACECAMERA, - BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY, + BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY, CAMFOLLOWSPLAYER, NOMIPMAP, ISOMETRICSPRITES, // INVENTORY. INVENTORY, @@ -185,7 +188,7 @@ decorate : cstyle { PICKUPFLASH, ALWAYSPICKUP, FANCYPICKUPSOUND, BIGPOWERUP, KEEPDEPLETED, IGNORESKILL, ADDITIVETIME, UNTOSSABLE, RESTRICTABSOLUTELY, NEVERRESPAWN, NOSCREENFLASH, NOATTENPICKUPSOUND, TOSSED, TRANSFER, NOTELEPORTFREEZE, UNCLEARABLE, NOSCREENBLINK, - ISHEALTH, ISARMOR, + ISHEALTH, ISARMOR, NEVERLOCAL, ISKEYITEM, // PLAYERPAWN. PLAYERPAWN, @@ -389,7 +392,8 @@ decorate : cstyle { // A_SpawnParticle flags SPF_FULLBRIGHT, SPF_RELACCEL, SPF_RELANG, SPF_RELATIVE, SPF_RELPOS, SPF_RELVEL, SPF_NOTIMEFREEZE, - SPF_ROLL, SPF_REPLACE, SPF_NO_XY_BILLBOARD, SPF_LOCAL_ANIM, + SPF_ROLL, SPF_REPLACE, SPF_NO_XY_BILLBOARD, SPF_LOCAL_ANIM, SPF_NEGATIVE_FADESTEP, SPF_FACECAMERA, + SPF_NOFACECAMERA, SPF_ROLLCENTER, SPF_NOMIPMAP, // Render styles STYLE_None, STYLE_Normal, STYLE_Fuzzy, STYLE_SoulTrans, STYLE_OptFuzzy, STYLE_Stencil, STYLE_Translucent, @@ -523,14 +527,14 @@ decorate : cstyle { A_BulletAttack; A_MonsterRail; A_Blast = "[int flags], [float strength], [float radius], [float speed], [class blasteffect], [sound blastsound]"; - A_Explode = "[int dmg], [int radius], [int flags], [bool alert], [int fulldmgradius], [int nails], [int naildmg], [string pufftype], [string damagetype]"; + A_Explode = "[int dmg], [float radius], [int flags], [bool alert], [float fulldmgradius], [int nails], [int naildmg], [string pufftype], [string damagetype]"; A_RadiusDamageSelf = "[int damage], [float distance], [int flags], [string flashtype]"; - A_RadiusThrust = "[int thrust], [int radius], [int flags], [int fullthrustdistance]"; + A_RadiusThrust = "[int thrust], [float radius], [int flags], [float fullthrustdistance]"; A_RadiusGive = "class itemtype, float distance, int flags, [int amount], [class filter], [string species], [float mindist], [int limit]"; A_Detonate; A_ThrowGrenade = "string spawntype, [float spawnheight], [float throwspeed_horz], [float throwspeed_vert], [bool useammo]"; - A_Quake = "float intensity, int duration, int damrad, int tremrad, [sound sfx]"; - A_QuakeEx = "float intensityX, float intensityY, float intensityZ, int duration, int damrad, int tremrad, [sound sfx], [int flags], [float mulWaveX], [float mulWaveY], [float mulWaveZ], [int falloff], [int highpoint], [float rollIntensity], [float rollWave], [float damageMultiplier], [float thrustMultiplier], [int damage]"; + A_Quake = "float intensity, int duration, float damrad, float tremrad, [sound sfx]"; + A_QuakeEx = "float intensityX, float intensityY, float intensityZ, int duration, float damrad, float tremrad, [sound sfx], [int flags], [float mulWaveX], [float mulWaveY], [float mulWaveZ], [float falloff], [int highpoint], [float rollIntensity], [float rollWave], [float damageMultiplier], [float thrustMultiplier], [int damage]"; A_SetTics = "int tics"; A_FreezeDeath; diff --git a/dist/res/config/languages/umapinfo.txt b/dist/res/config/languages/umapinfo.txt index 85e342cdd..b6d4f66f6 100644 --- a/dist/res/config/languages/umapinfo.txt +++ b/dist/res/config/languages/umapinfo.txt @@ -6,7 +6,7 @@ umapinfo keywords = { - map, true, false, clear, levelname, label, levelpic, next, nextsecret, skytexture, music, exitpic, enterpic, + map, true, false, clear, levelname, label, author, levelpic, next, nextsecret, skytexture, music, exitpic, enterpic, partime, endgame, endpic, endbunny, endcast, nointermission, intertext, intertextsecret, interbackdrop, intermusic, episode, bossaction } diff --git a/dist/res/config/languages/zdoom.txt b/dist/res/config/languages/zdoom.txt index d80d25c35..b7ad3e616 100644 --- a/dist/res/config/languages/zdoom.txt +++ b/dist/res/config/languages/zdoom.txt @@ -130,7 +130,7 @@ z_iwadinfo Name, AutoName, Game, Config, IWADName, MapInfo, MustContain, BannerColors, StartupType, StartupSong, Compatibility, Required, Load, IgnoreTitlePatches, DeleteLumps, NoKeyboardCheats, LoadLights, LoadBrightmaps, LoadWidescreen, - DiscordAppId, SteamAppId + DiscordAppId, SteamAppId, SkipBexStringsIfLanguage } } @@ -143,7 +143,7 @@ z_keyconf { blocks = "addkeysection", "weaponsection"; keywords = { - alias, bind, defaultbind, addkeysection, addmenukey, addslotdefault, + alias, defaultbind, addkeysection, addmenukey, addslotdefault, weaponsection, setslot, clearplayerclasses, addplayerclass } } @@ -257,8 +257,8 @@ z_mapinfo { e2m8special, e3m8special, e4m6special, e4m8special, disableshadowmap, enableshadowmap, avoidmelee, compat_avoidhazards, compat_stayonlift, compat_nombf21, compat_vileghosts, attenuatelights, intro, outro, lightblendmode, cvar_redirect, compat_voodoozombies, - nopassover, passover, colormap, nogravity, lightningsound, isocam_pitch, isometricmode, - isometricsprites, iso_dist, orthographic, + nopassover, passover, colormap, nogravity, lightningsound, compat_noacsargcheck, + nofogofwar, // GZDoom FogDensity, OutsideFogDensity, SkyFog, LightMode, NoColoredSpriteLighting, SkyRotate, PixelRatio, @@ -286,7 +286,7 @@ z_mapinfo { BlurAmount, CorrectPrintBold, MenuSliderColor, althudclass, forcenogfxsubstitution, forcetextinmenus, fullscreenautoaspect, nomergepickupmsg, normforwardmove, normsidemove, statscreen_authorfont, statscreen_contentfont, menusliderbackcolor, hidepartimes, adddialogues, helpmenuclass, menudelegateclass, - intro, + intro, basicarmorclass, hexenarmorclass, // Intermission definitions Intermission, Link, Cast, Fader, GotoTitle, Image, Scroller, TextScreen, Wiper, Background, CDMusic, Draw, @@ -336,14 +336,17 @@ z_menudef { NetgameMessage, StaticPatchCentered, StaticTextCentered, MouseWindow, CenterMenu, Title, PlayerNameBox, ValueText, MapControl, Else, TextField, NumberField, ScaleSlider, Size, AnimatedTransition, FlagOption, Before, After, DontDim, DontBlur, - ForceList, Animated + ForceList, Animated, CenterText, Caption, CaptionItem, Clean, protected, + PlayerNameField, PlayerTeamItem, PlayerColorItem, PlayerColorSlider, PlayerClassItem, + PlayerSkinItem, PlayerGenderItem, AutoaimSlider, PlayerSwitchOnPickupItem, Indent, + LabeledSubMenu, SliderReverbEditOption, ReverbOption, ReverbSelect } functions { ifgame = "game, [...]"; ifoption = "option, [...]"; } constants = { doom, heretic, hexen, strife, chex, readthis, swapmenu, windows, unix, mac, - openal, LoadMenu, SaveMenu, PlayerMenu, JoystickConfigMenu, + openal, swrender, mmx, LoadMenu, SaveMenu, PlayerMenu, JoystickConfigMenu, GameplayMenu, CompatibilityMenu, VideoModeMenu, } } @@ -378,7 +381,8 @@ z_voxeldef { function_link = "http://zdoom.org/wiki/VOXELDEF"; keywords = { - AngleOffset, Scale, Spin, DroppedSpin, PlacedSpin, OverridePalette, + AngleOffset, PitchFromMomentum, UseActorPitch, UseActorRoll, Scale, XOffset, YOffset, ZOffset, + Spin, DroppedSpin, PlacedSpin, OverridePalette } } diff --git a/dist/res/config/languages/zscript.txt b/dist/res/config/languages/zscript.txt index 78362ea34..64d230250 100644 --- a/dist/res/config/languages/zscript.txt +++ b/dist/res/config/languages/zscript.txt @@ -29,7 +29,45 @@ zscript properties = { - // Actor flags (as variables accessible from scripts) + // Actor properties -------------------------------------------------------------------------------- + + // Actor + Skip_Super, DefaultStateUsage, Tag, PainChance, DefThreshold, Threshold, Damage, DamageFunction, + Scale, FloatBobPhase, FloatBobStrength, Args, DropItem, RenderStyle, DefaultAlpha, Translation, + StencilColor, BloodColor, BloodType, BounceType, BounceFactor, WallBounceFactor, DamageType, + PainType, DeathType, DamageFactor, Decal, PoisonDamage, Gravity, SpriteAngle, Friction, ClearFlags, + Monster, Projectile, Activation, DesignatedTeam, VisibleToTeam, VisibleToPlayerClass, DistanceCheck, + + // Actor (MBF21) + InfightingGroup, ProjectileGroup, SplashGroup, + + // Inventory + RestrictedTo, ForbiddenTo, Icon, AltHudIcon, DefMaxAmount, + + // Weapon + DefaultKickback, BobStyle, PreferredSkin, + + // Powerup/PowerupGiver + Color, Colormap, Duration, + + // PowerupGiver + Type, + + // PlayerPawn + DisplayName, SoundClass, Face, ColorRange, ColorSet, ColorSetFile, ClearColorSet, SpawnClass, + ForwardMove, SideMove, ScoreIcon, CrouchSprite, DamageScreenColor, StartItem, HexenArmor, + WeaponSlot, + + // MorphProjectile + PlayerClass, MonsterClass, /* Duration, */ MorphStyle, MorphFlash, UnmorphFlash, + + // PowerMorph + /* PlayerClass, MonsterClass, MorphStyle, MorphFlash, UnmorphFlash, */ + + // DynamicLight + /* Type, */ + + // Actor flags (as variables accessible from scripts) ---------------------------------------------- // Internal flags bINCHASE, bUNMORPHED, bFLY, bONMOBJ, bARGSDEFINED, bNOSIGHTCHECK, bCRASHED, @@ -107,7 +145,8 @@ zscript bMASKROTATION, bABSMASKANGLE, bABSMASKPITCH, bXFLIP, bYFLIP, bINTERPOLATEANGLES, bDONTINTERPOLATE, bSPRITEFLIP, bZDOOMTRANS, bCASTSPRITESHADOW, bNOSPRITESHADOW, bINVISIBLEINMIRRORS, bONLYVISIBLEINMIRRORS, bBILLBOARDFACECAMERA, - bBILLBOARDNOFACECAMERA, bFLIPSPRITEOFFSETX, bFLIPSPRITEOFFSETY, + bBILLBOARDNOFACECAMERA, bFLIPSPRITEOFFSETX, bFLIPSPRITEOFFSETY, bCAMFOLLOWSPLAYER, + bNOMIPMAP, bISOMETRICSPRITES, // Bounce flags bBOUNCEONWALLS, bBOUNCEONFLOORS, bBOUNCEONCEILINGS, bALLOWBOUNCEONACTORS, @@ -192,7 +231,8 @@ zscript MASKROTATION, ABSMASKANGLE, ABSMASKPITCH, XFLIP, YFLIP, INTERPOLATEANGLES, DONTINTERPOLATE, SPRITEFLIP, ZDOOMTRANS, CASTSPRITESHADOW, NOSPRITESHADOW, INVISIBLEINMIRRORS, ONLYVISIBLEINMIRRORS, BILLBOARDFACECAMERA, - BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY, + BILLBOARDNOFACECAMERA, FLIPSPRITEOFFSETX, FLIPSPRITEOFFSETY, CAMFOLLOWSPLAYER, + NOMIPMAP, ISOMETRICSPRITES, // Bounce flags BOUNCEONWALLS, BOUNCEONFLOORS, BOUNCEONCEILINGS, ALLOWBOUNCEONACTORS,