From 420b892a0ca2d307e142794e8e246c986c361353 Mon Sep 17 00:00:00 2001 From: Ioan Chera Date: Thu, 29 Dec 2016 21:06:27 +0200 Subject: [PATCH 1/4] Added comments for two Eternity passive specials --- zspecial.acs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zspecial.acs b/zspecial.acs index f06f2eb..ebefd08 100644 --- a/zspecial.acs +++ b/zspecial.acs @@ -263,7 +263,10 @@ special 270:Stairs_BuildDownDoom(5), 271:Stairs_BuildUpDoomSync(4), 272:Stairs_BuildDownDoomSync(4), - + + // new to Eternity +// 300:Portal_Define(5), +// 301:Line_QuickPortal(1), // internal functions have negative values From 2f18cac6bff862292dab11936ce7814d010eacae Mon Sep 17 00:00:00 2001 From: Ioan Chera Date: Sat, 7 Jan 2017 22:31:12 +0200 Subject: [PATCH 2/4] Updated some specials to support some arguments added by Eternity --- zspecial.acs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zspecial.acs b/zspecial.acs index d271d9d..dd41f89 100644 --- a/zspecial.acs +++ b/zspecial.acs @@ -44,7 +44,7 @@ special 37:Floor_MoveToValue(3,5), 38:Ceiling_Waggle(5), 39:Teleport_ZombieChanger(2), - 40:Ceiling_LowerByValue(3,4), + 40:Ceiling_LowerByValue(3,5), 41:Ceiling_RaiseByValue(3,4), 42:Ceiling_CrushAndRaise(3,4), 43:Ceiling_LowerAndCrush(3,4), @@ -187,7 +187,7 @@ special 196:Ceiling_CrushAndRaiseA(4,5), 197:Ceiling_CrushAndRaiseSilentA(4,5), 198:Ceiling_RaiseByValueTimes8(3,4), - 199:Ceiling_LowerByValueTimes8(3,4), + 199:Ceiling_LowerByValueTimes8(3,5), 200:Generic_Floor(5), 201:Generic_Ceiling(5), 202:Generic_Door(5), @@ -203,7 +203,7 @@ special 212:Sector_SetColor(4,5), 213:Sector_SetFade(4), 214:Sector_SetDamage(3,5), - 215:Teleport_Line(2), + 215:Teleport_Line(2,3), 216:Sector_SetGravity(3), 217:Stairs_BuildUpDoom(5), 218:Sector_SetWind(4), From 092b70d863b737a08215c851ecc309cb97250bf9 Mon Sep 17 00:00:00 2001 From: Ioan Chera Date: Sun, 8 Jan 2017 00:58:58 +0200 Subject: [PATCH 3/4] Added Stairs_BuildUpDoomCrush to zspecials.acs Used by Eternity to emulate the Boom-standardized 16-unit crushing stairs (I know in vanilla the crushing was governed by uninitialized variables). --- zspecial.acs | 1 + 1 file changed, 1 insertion(+) diff --git a/zspecial.acs b/zspecial.acs index dd41f89..1d8a01e 100644 --- a/zspecial.acs +++ b/zspecial.acs @@ -263,6 +263,7 @@ special 270:Stairs_BuildDownDoom(5), 271:Stairs_BuildUpDoomSync(4), 272:Stairs_BuildDownDoomSync(4), + 273:Stairs_BuildUpDoomCrush(5), // new to Eternity // 300:Portal_Define(5), From 77b5a1193e912ae5b5ca84256954744ce2c80eb7 Mon Sep 17 00:00:00 2001 From: Ioan Chera Date: Sun, 8 Jan 2017 21:10:58 +0200 Subject: [PATCH 4/4] Added APROP constants for Eternity's eight thing counters Small used to support accessing thing counters (user defined states) from scripts, so I'm adding this feature back to ACS for Eternity. There are eight int counters per Mobj and no more will be added, so I suppose it's alright to use eight APROP enums for them instead of, say, new ACS functions. Small's functions to access variables were very similar to SetActorProperty/CheckActorProperty. --- zdefs.acs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/zdefs.acs b/zdefs.acs index 4cef9bf..946088b 100644 --- a/zdefs.acs +++ b/zdefs.acs @@ -295,6 +295,16 @@ #define APROP_MaxDropOffHeight 45 #define APROP_DamageType 46 +// New to Eternity +#define APROP_Counter0 100 +#define APROP_Counter1 101 +#define APROP_Counter2 102 +#define APROP_Counter3 103 +#define APROP_Counter4 104 +#define APROP_Counter5 105 +#define APROP_Counter6 106 +#define APROP_Counter7 107 + // Render Styles ------------------------------------------------------------ #define STYLE_None 0 // Do not draw