diff --git a/extras/acs/srb2defs.acs b/extras/acs/srb2defs.acs index 062ae6c9beb7dadaa6609e6698b86b5906026718..77ec30247b854adab398608a8807febfd4700942 100644 --- a/extras/acs/srb2defs.acs +++ b/extras/acs/srb2defs.acs @@ -215,6 +215,35 @@ #define SKYBOXCHANGE_CENTERPOINT 1 #define SKYBOXCHANGE_BOTHPOINTS 2 +// Light fade options + +#define LIGHTFADE_RELATIVE (1 << 0) +#define LIGHTFADE_OVERRIDE (1 << 1) +#define LIGHTFADE_TICBASED (1 << 2) + +// Strobe light options + +#define STROBELIGHT_USETARGET (1 << 0) +#define STROBELIGHT_SYNC (1 << 1) + +// 3D floor crumble options + +#define CRUMBLE3DFLOOR_NORESPAWN (1 << 0) +#define CRUMBLE3DFLOOR_CHECKNORESPAWNFLAG (1 << 1) + +// 3D floor fade options + +#define FADE3DFLOOR_RELATIVE (1 << 0) +#define FADE3DFLOOR_OVERRIDE (1 << 1) +#define FADE3DFLOOR_TICBASED (1 << 2) +#define FADE3DFLOOR_IGNORECOLLISION (1 << 3) +#define FADE3DFLOOR_GHOSTFADE (1 << 4) +#define FADE3DFLOOR_DONTDOTRANSLUCENT (1 << 5) +#define FADE3DFLOOR_DONTDOEXISTENCE (1 << 6) +#define FADE3DFLOOR_DONTDOLIGHTING (1 << 7) +#define FADE3DFLOOR_DONTDOCOLORMAP (1 << 8) +#define FADE3DFLOOR_USEEXACTALPHA (1 << 9) + // Player powers #define POWER_INVULNERABILITY 0 diff --git a/extras/acs/srb2special.acs b/extras/acs/srb2special.acs index 93aec57838fa1dec3a5cccea64438831d2d57316..b0d9eb7677b790f616f0c68a16748b077d7acac4 100644 --- a/extras/acs/srb2special.acs +++ b/extras/acs/srb2special.acs @@ -65,8 +65,8 @@ special -342:PlayerHoldingFlag(2), -343:PlayerIsIt(1), -344:PlayerFinished(1), - -345:Check2DMode(0), - -346:Set2DMode(1), + -345:Check2dMode(0), + -346:Set2dMode(1), -500:CameraWait(1), -503:SetLineRenderStyle(3), @@ -99,10 +99,9 @@ special 403:Sector_MoveByFrontSector(2), 409:Sector_ChangeTag(3), 411:Sector_Stop(1), - 416:Light_StartFlickering(3,5), - 417:Light_StartPulsating(3,5), + 416:Light_StartFlickering(4,5), + 417:Light_StartPulsating(4,5), 418:Light_StartBlinking(3,6), - 419:Light_StartBlinkingSynchronized(3,6), 420:Light_Fade(3,6), 421:StopLightingEffect(1), 424:ChangeWeather(1,2), @@ -122,8 +121,8 @@ special 449:EnableBosses(1,2), 450:LinedefExecute(1), 451:LinedefExecuteRandom(2), - 452:Sector_Set3dFloorTranslucency(3), - 453:Sector_Fade3dFloor(4), + 452:Sector_Set3dFloorTranslucency(3,4), + 453:Sector_Fade3dFloor(4,5), 454:Sector_StopFading3dFloor(2), 455:FadeColormap(3,4), 456:StopColormapFade(1),