Skip to content

Commit

Permalink
Language definitions update (sirjuddington#1713)
Browse files Browse the repository at this point in the history
  • Loading branch information
Blue-Shadow authored Sep 23, 2024
1 parent e745dc0 commit c0b3480
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 21 deletions.
22 changes: 13 additions & 9 deletions dist/res/config/languages/decorate.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -118,6 +118,9 @@ decorate : cstyle {
// Puzzle items
PuzzleItem, Number, FailMessage, FailSound,

// Spectator camera
SpectatorCamera, ChaseMode, ChasingTracer, LagDistance,

// Combos
Monster, Projectile,

Expand Down Expand Up @@ -177,15 +180,15 @@ 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,
QUIET, AUTOACTIVATE, UNDROPPABLE, INVBAR, HUBPOWER, PERSISTENTPOWER, INTERHUBSTRIP,
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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dist/res/config/languages/umapinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
20 changes: 12 additions & 8 deletions dist/res/config/languages/zdoom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand All @@ -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
}
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
}
}
Expand Down Expand Up @@ -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
}
}

Expand Down
46 changes: 43 additions & 3 deletions dist/res/config/languages/zscript.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c0b3480

Please sign in to comment.