From b6183abb8b501647be4898fd88b26d427ccda8de Mon Sep 17 00:00:00 2001 From: Lactozilla Date: Tue, 30 Apr 2024 01:40:07 -0300 Subject: [PATCH] Change various functions and add enums --- extras/acs/srb2defs.acs | 51 ++++++++++++++++++++++++++++++++++++++ extras/acs/srb2special.acs | 41 ++++++++++++++---------------- 2 files changed, 69 insertions(+), 23 deletions(-) diff --git a/extras/acs/srb2defs.acs b/extras/acs/srb2defs.acs index 8e1fee865..a5233787c 100644 --- a/extras/acs/srb2defs.acs +++ b/extras/acs/srb2defs.acs @@ -164,6 +164,57 @@ #define SECSPAC_FloorMissile 1024 // when a projectile touches the floor of this sector #define SECSPAC_CeilingMissile 2048 // when a projectile touches the ceiling of this sector +// Sector planes + +#define SECPLANE_FLOOR 0 +#define SECPLANE_CEILING 1 +#define SECPLANE_BOTH 2 + +// Tag options + +#define TAG_ADD 0 +#define TAG_REMOVE 1 +#define TAG_REPLACEFIRST 2 +#define TAG_TRIGGERTAG 3 + +// Light copy options + +#define COPYLIGHT_NOSECTOR (1 << 0) +#define COPYLIGHT_NOFLOOR (1 << 1) +#define COPYLIGHT_NOCEILING (1 << 2) + +// Colormap fade options + +#define COLORMAPCHANGE_RELATIVE (1 << 0) +#define COLORMAPCHANGE_SUBLIGHTR (1 << 1) +#define COLORMAPCHANGE_SUBLIGHTG (1 << 2) +#define COLORMAPCHANGE_SUBLIGHTB (1 << 3) +#define COLORMAPCHANGE_SUBLIGHTA (1 << 4) +#define COLORMAPCHANGE_SUBFADER (1 << 5) +#define COLORMAPCHANGE_SUBFADEG (1 << 6) +#define COLORMAPCHANGE_SUBFADEB (1 << 7) +#define COLORMAPCHANGE_SUBFADEA (1 << 8) +#define COLORMAPCHANGE_SUBFADESTART (1 << 9) +#define COLORMAPCHANGE_SUBFADEEND (1 << 10) +#define COLORMAPCHANGE_IGNOREFLAGS (1 << 11) +#define COLORMAPCHANGE_FROMBLACK (1 << 12) +#define COLORMAPCHANGE_OVERRIDE (1 << 13) + +// Weather + +#define WEATHER_NONE 0 +#define WEATHER_STORM 1 +#define WEATHER_SNOW 2 +#define WEATHER_RAIN 3 +#define WEATHER_STORM_NORAIN 5 +#define WEATHER_STORM_NOSTRIKES 6 + +// Skybox change options + +#define SKYBOXCHANGE_VIEWPOINT 0 +#define SKYBOXCHANGE_CENTERPOINT 1 +#define SKYBOXCHANGE_BOTHPOINTS 2 + // Player powers #define POWER_INVULNERABILITY 0 diff --git a/extras/acs/srb2special.acs b/extras/acs/srb2special.acs index c757b92bb..93aec5783 100644 --- a/extras/acs/srb2special.acs +++ b/extras/acs/srb2special.acs @@ -7,8 +7,8 @@ special -5:SetSectorProperty(3), -7:GetSideProperty(2), -8:SetSideProperty(3), - -100:strcmp(2,3), - -101:strcasecmp(2,3), + -100:strcmp(2), + -101:strcasecmp(2), -120:PlayerRings(0), -122:PlayerScore(0), -123:PlayerSuper(0), @@ -94,46 +94,41 @@ special // SRB2 linedef types (400-499) // Not all are implemented - 400:Floor_SetHeight(2), - 401:Ceiling_SetHeight(2), - 402:Light_ChangeToValue(2), - 403:Floor_Move(2), - 404:Ceiling_Move(2), + 400:Sector_MoveByLine(2), + 402:Light_Copy(1,2), + 403:Sector_MoveByFrontSector(2), 409:Sector_ChangeTag(3), - 411:Plane_Stop(1), + 411:Sector_Stop(1), 416:Light_StartFlickering(3,5), 417:Light_StartPulsating(3,5), 418:Light_StartBlinking(3,6), 419:Light_StartBlinkingSynchronized(3,6), 420:Light_Fade(3,6), 421:StopLightingEffect(1), - 424:Weather_Change(1,2), + 424:ChangeWeather(1,2), 428:Plat_StartMovement(1,2), 429:Sector_Crush(1,2), - 433:GravityFlip(0,2), 435:Plane_ChangeScrollerDirection(2), - 436:FOF_Shatter(2), + 436:Sector_Shatter3dFloor(2), 437:LockPlayer(1,2), - 439:Line_ChangeTextures(2,4), 440:StartMetalSonicRace(0), 441:ConditionSetTrigger(1), 443:CallLuaFunction(1), 444:Earthquake(1,3), - 445:FOF_Disappear(2,3), - 446:FOF_Crumble(2,3), - 447:Colormap_Change(1,3), - 448:Skybox_Change(2,4), + 445:Sector_Hide3dFloor(2,3), + 446:Sector_Crumble3dFloor(2,3), + 447:ChangeColormap(2,3), + 448:ChangeSkybox(2,4), 449:EnableBosses(1,2), 450:LinedefExecute(1), 451:LinedefExecuteRandom(2), - 452:FOF_SetTranslucency(3), - 453:FOF_Fade(4), - 454:FOF_StopFading(2), - 455:Colormap_Fade(3,4), - 456:Colormap_StopFading(1), + 452:Sector_Set3dFloorTranslucency(3), + 453:Sector_Fade3dFloor(4), + 454:Sector_StopFading3dFloor(2), + 455:FadeColormap(3,4), + 456:StopColormapFade(1), 462:StopTimer(0), - 464:TriggerEggCapsule(1,2), - 466:SetLevelFailureState(1), + 466:SetLevelFailed(1), 475:ACS_NamedExecute(1,10), 476:ACS_NamedExecuteAlways(1,10), 477:ACS_NamedSuspend(1),