Zandronum 3.1 ACS changes (#668)

* Updated the bundled Zandronum ACC with Zan 3.1 changes * Add Zandronum 3.1 functions and constants to its ACS configuration * Updated the Zandronum ACC (again), as it was missing GAMESTATE definitions
2025-02-16 09:01:27 +00:00 · 2021-12-14 19:24:23 +00:00 · 2021-12-14 19:24:23 +00:00 · c1d0428ccc
commit c1d0428ccc
parent 54b99ee710
4 changed files with 515 additions and 37 deletions
--- a/Build/Compilers/Zandronum/acc.exe
+++ b/Build/Compilers/Zandronum/acc.exe
--- a/Build/Compilers/Zandronum/zdefs.acs
+++ b/Build/Compilers/Zandronum/zdefs.acs
@ -193,6 +193,10 @@
 #define CR_DARKGRAY				20
 #define CR_DARKGREY				20
 #define CR_CYAN					21
+#define CR_ICE					22
+#define CR_FIRE					23
+#define CR_SAPPHIRE				24
+#define CR_TEAL					25

 // HUD message types --------------------------------------------------------

@ -289,6 +293,21 @@
 #define APROP_ViewHeight	39
 #define APROP_AttackZOffset	40
 #define APROP_StencilColor	41
+#define APROP_Friction		42
+#define APROP_DamageMultiplier	43
+#define APROP_MaxStepHeight 44
+#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 ------------------------------------------------------------

@ -298,6 +317,8 @@
 #define STYLE_SoulTrans		3	// Draw translucent with amount in r_transsouls
 #define STYLE_OptFuzzy		4	// Draw as fuzzy, translucent or shadow, based on user preference
 #define STYLE_Stencil		5	// Draw as solid color
+#define STYLE_AddStencil	6	// Draw as additive solid color
+#define STYLE_AddShaded		7	// 
 #define STYLE_Translucent	64	// Draw translucent
 #define STYLE_Add			65	// Draw additive
 #define STYLE_Shaded		66	// 
@ -346,6 +367,7 @@
 #define DAMAGE_NONPLAYERS			2
 #define DAMAGE_IN_AIR				4
 #define DAMAGE_SUBCLASSES_PROTECT	8
+#define DAMAGE_NO_ARMOR			16

 // Flags for MorphActor -----------------------------------------------------

@ -362,6 +384,8 @@
 #define MRF_UNDOBYDEATH			0x00000200
 #define MRF_UNDOBYDEATHFORCED	0x00000400
 #define MRF_UNDOBYDEATHSAVES	0x00000800
+#define MRF_UNDOALWAYS			0x00001000
+#define MRF_TRANSFERTRANSLATION 0x00002000

 // Shared spawnable things from Hexen. You can spawn these in the other -----
 // games if you provide sprites for them, otherwise they'll be invisible. ---
@ -687,6 +711,9 @@
 #define CHAN_VOICE				2
 #define CHAN_ITEM				3
 #define CHAN_BODY				4
+#define CHAN_5					5
+#define CHAN_6					6
+#define CHAN_7					7

 // Modifier flags for PlaySound

@ -741,6 +768,12 @@
 #DEFINE	AAPTR_PLAYER8 0x2000

 #DEFINE AAPTR_FRIENDPLAYER 0x4000
+#DEFINE AAPTR_GET_LINETARGET 0x8000
+
+// [AK] Actor pointers used exclusively for GAMEEVENT_ACTOR_DAMAGED
+#DEFINE AAPTR_DAMAGE_SOURCE 0x10000000
+#DEFINE AAPTR_DAMAGE_INFLICTOR 0x40000000
+#DEFINE AAPTR_DAMAGE_TARGET 0x80000000

 // Actor pointer operation flags

@ -764,6 +797,15 @@

 #define SPAC_None			0

+// GetArmorInfo
+
+#define ARMORINFO_CLASSNAME		0
+#define ARMORINFO_SAVEAMOUNT		1
+#define ARMORINFO_SAVEPERCENT		2
+#define ARMORINFO_MAXABSORB		3
+#define ARMORINFO_MAXFULLABSORB		4
+#define ARMORINFO_ACTUALSAVEAMOUNT	5
+
 // ==========================================================================
 // Skulltag Definitions
 // ==========================================================================
@ -860,6 +902,28 @@
 #define DB_ORDER_ASC			0
 #define DB_ORDER_DESC			1

+// Zandronum gamemode states ------------------------------------------------
+#define GAMESTATE_UNSPECIFIED		-1
+#define GAMESTATE_WAITFORPLAYERS	0
+#define GAMESTATE_COUNTDOWN		1
+#define GAMESTATE_INPROGRESS		2
+#define GAMESTATE_INRESULTSEQUENCE	3
+
+// Zandronum EVENT script types ---------------------------------------------
+#define GAMEEVENT_PLAYERFRAGS		0
+#define GAMEEVENT_MEDALS		1
+#define GAMEEVENT_CAPTURES		2
+#define GAMEEVENT_TOUCHES		3
+#define GAMEEVENT_RETURNS		4
+#define GAMEEVENT_ROUND_STARTS		5
+#define GAMEEVENT_ROUND_ENDS		6
+#define GAMEEVENT_ROUND_ABORTED		7
+#define GAMEEVENT_CHAT			8
+#define GAMEEVENT_PLAYERCONNECT		9
+#define GAMEEVENT_ACTOR_SPAWNED		10
+#define GAMEEVENT_ACTOR_DAMAGED		11
+#define GAMEEVENT_ACTOR_ARMORDAMAGED	12
+
 // Events when you have input grabbed

 #define EV_KeyDown				1	// data1: unshifted ASCII, data2: shifted ASCII
@ -941,6 +1005,13 @@
 #define SECF_NOFALLINGDAMAGE 2
 #define SECF_FLOORDROP 4
 #define SECF_NORESPAWN 8
+#define SECF_FRICTION 16
+#define SECF_PUSH 32
+#define SECF_SILENTMOVE 64
+#define SECF_DMGTERRAINFX	128
+#define SECF_DMGENDGODMODE 256
+#define SECF_DMGENDLEVEL 512
+#define SECF_DMGHAZARD 1024

 #define BLOCKF_CREATURES 1
 #define BLOCKF_MONSTERS 2
@ -952,6 +1023,7 @@
 #define BLOCKF_USE 128
 #define BLOCKF_SIGHT 256
 #define BLOCKF_HITSCAN 512
+#define BLOCKF_SOUND 1024

 #define FOGP_DENSITY 0
 #define FOGP_OUTSIDEDENSITY 1
@ -960,11 +1032,150 @@
 #define PRINTNAME_LEVELNAME -1
 #define PRINTNAME_LEVEL -2
 #define PRINTNAME_SKILL -3
+#define PRINTNAME_NEXTLEVEL -4
+#define PRINTNAME_NEXTSECRET -5

 #define CSF_NOFAKEFLOORS 1
 #define CSF_NOBLOCKALL 2

 #define FHF_NORANDOMPUFFZ	1
+#define FHF_NOIMPACTDECAL	2
+
+// PickActor flags
+
+#define	PICKAF_FORCETID			1
+#define	PICKAF_RETURNTID		2
+
+// magic value to set the ice translation through ACS
+#define TRANSLATION_ICE 0x100007
+
+// Actor flags
+#define MF_SPECIAL          0x00000001
+#define MF_SOLID            0x00000002
+#define MF_SHOOTABLE        0x00000004
+#define MF_NOSECTOR         0x00000008
+#define MF_NOBLOCKMAP       0x00000010
+#define MF_AMBUSH           0x00000020
+#define MF_JUSTHIT          0x00000040
+#define MF_JUSTATTACKED     0x00000080
+#define MF_SPAWNCEILING     0x00000100
+#define MF_NOGRAVITY        0x00000200
+#define MF_DROPOFF          0x00000400
+#define MF_PICKUP           0x00000800
+#define MF_NOCLIP           0x00001000
+#define MF_INCHASE          0x00002000
+#define MF_FLOAT            0x00004000
+#define MF_TELEPORT         0x00008000
+#define MF_MISSILE          0x00010000
+#define MF_DROPPED          0x00020000
+#define MF_SHADOW           0x00040000
+#define MF_NOBLOOD          0x00080000
+#define MF_CORPSE           0x00100000
+#define MF_INFLOAT          0x00200000
+#define MF_INBOUNCE         0x00200000
+#define MF_COUNTKILL        0x00400000
+#define MF_COUNTITEM        0x00800000
+#define MF_SKULLFLY         0x01000000
+#define MF_NOTDMATCH        0x02000000
+#define MF_SPAWNSOUNDSOURCE 0x04000000
+#define MF_FRIENDLY         0x08000000
+#define MF_UNMORPHED        0x10000000
+#define MF_NOLIFTDROP       0x20000000
+#define MF_STEALTH          0x40000000
+#define MF_ICECORPSE        0x80000000
+
+// Linedef flags
+#define ML_BLOCKING            0x00000001
+#define ML_BLOCKMONSTERS       0x00000002
+#define ML_TWOSIDED            0x00000004
+#define ML_DONTPEGTOP          0x00000008
+#define ML_DONTPEGBOTTOM       0x00000010
+#define ML_SECRET              0x00000020
+#define ML_SOUNDBLOCK          0x00000040
+#define ML_DONTDRAW            0x00000080
+#define ML_MAPPED              0x00000100
+#define ML_REPEAT_SPECIAL      0x00000200
+#define ML_ADDTRANS            0x00000400
+#define ML_MONSTERSCANACTIVATE 0x00002000
+#define ML_BLOCK_PLAYERS       0x00004000
+#define ML_BLOCKEVERYTHING     0x00008000
+#define ML_ZONEBOUNDARY        0x00010000
+#define ML_RAILING             0x00020000
+#define ML_BLOCK_FLOATERS      0x00040000
+#define ML_CLIP_MIDTEX         0x00080000
+#define ML_WRAP_MIDTEX         0x00100000
+#define ML_3DMIDTEX            0x00200000
+#define ML_CHECKSWITCHRANGE    0x00400000
+#define ML_FIRSTSIDEONLY       0x00800000
+#define ML_BLOCKPROJECTILE     0x01000000
+#define ML_BLOCKUSE            0x02000000
+#define ML_BLOCKSIGHT          0x04000000
+#define ML_BLOCKHITSCAN        0x08000000
+
+#define QF_RELATIVE		1
+#define QF_SCALEDOWN		1 << 1
+#define QF_SCALEUP		1 << 2
+#define QF_MAX			1 << 3
+#define QF_FULLINTENSITY	1 << 4
+#define QF_WAVE			1 << 5
+
+#define WARPF_ABSOLUTEOFFSET 0x1
+#define WARPF_ABSOLUTEANGLE 0x2
+#define WARPF_USECALLERANGLE 0x4
+#define WARPF_NOCHECKPOSITION 0x8
+#define WARPF_INTERPOLATE 0x10
+#define WARPF_WARPINTERPOLATION 0x20
+#define WARPF_COPYINTERPOLATION 0x40
+#define WARPF_STOP 0x80
+#define WARPF_TOFLOOR 0x100
+#define WARPF_TESTONLY 0x200
+#define WARPF_ABSOLUTEPOSITION 0x400
+#define WARPF_BOB 0x800
+#define WARPF_MOVEPTR 0x1000
+#define WARPF_USEPTR 0x2000
+#define WARPF_COPYVELOCITY 0x4000
+#define WARPF_COPYPITCH 0x8000
+
+#define CPXF_ANCESTOR    (1 << 0)
+#define CPXF_LESSOREQUAL (1 << 1)
+#define CPXF_NOZ         (1 << 2)
+#define CPXF_COUNTDEAD   (1 << 3)
+#define CPXF_DEADONLY    (1 << 4)
+#define CPXF_EXACT       (1 << 5)
+#define CPXF_SETTARGET   (1 << 6)
+#define CPXF_SETMASTER   (1 << 7)
+#define CPXF_SETTRACER   (1 << 8)
+#define CPXF_FARTHEST    (1 << 9)
+#define CPXF_CLOSEST     (1 << 10)
+#define CPXF_SETONPTR    (1 << 11)
+#define CPXF_CHECKSIGHT  (1 << 12)
+
+#define SECPART_Floor 0
+#define SECPART_Ceiling 1
+#define SECPART_3D 2
+
+// For Line_SetAutomapFlags; These are or'd together
+#define AMLF_Secret		(1 << 0)
+#define AMLF_DontDraw		(1 << 1)
+#define AMLF_Mapped		(1 << 2)
+#define AMLF_Revealed		(1 << 3)
+
+// For Line_SetAutomapStyle
+#define AMLS_Default		0
+#define AMLS_OneSided		1
+#define AMLS_TwoSided		2
+#define AMLS_FloorDiff		3
+#define AMLS_CeilingDiff	4
+#define AMLS_ExtraFloor		5
+#define AMLS_Special		6
+#define AMLS_Secret		7
+#define AMLS_NotSeen		8
+#define AMLS_Locked		9
+#define AMLS_IntraTeleport	10
+#define AMLS_InterTeleport	11
+#define AMLS_UnexploredSecret	12
+#define AMLS_Portal		13
+

 // [TP] For GetTimeProperty
 #define TM_SECOND 0
@ -974,3 +1185,29 @@
 #define TM_MONTH 4
 #define TM_YEAR 5
 #define TM_WEEKDAY 6
+
+// [AK] For SetGamemodeLimit
+#define GAMELIMIT_FRAGS 0
+#define GAMELIMIT_TIME 1
+#define GAMELIMIT_POINTS 2
+#define GAMELIMIT_DUELS 3
+#define GAMELIMIT_WINS 4
+#define GAMELIMIT_WAVES 5
+
+// [AK] For SetPlayerScore and GetPlayerScore
+#define SCORE_FRAGS 0
+#define SCORE_POINTS 1
+#define SCORE_WINS 2
+#define SCORE_DEATHS 3
+#define SCORE_KILLS 4
+#define SCORE_ITEMS 5
+#define SCORE_SECRETS 6
+#define SCORE_SPREAD 7
+#define SCORE_RANK 8
+
+// [AK] For GetMapRotationInfo
+#define MAPROTATION_Name 0
+#define MAPROTATION_LumpName 1
+#define MAPROTATION_Used 2
+#define MAPROTATION_MinPlayers 3
+#define MAPROTATION_MaxPlayers 4
--- a/Build/Compilers/Zandronum/zspecial.acs
+++ b/Build/Compilers/Zandronum/zspecial.acs
@ -21,15 +21,15 @@ special
 	 14:Door_Animated(3,4),
 	 15:Autosave(0),
 //	 16:Transfer_WallLight
-	 17:Thing_Raise(1),
+	 17:Thing_Raise(1,2),
 	 18:StartConversation(1,2),
 	 19:Thing_Stop(1),
-	 20:Floor_LowerByValue(3),
-	 21:Floor_LowerToLowest(2),
-	 22:Floor_LowerToNearest(2),
-	 23:Floor_RaiseByValue(3),
-	 24:Floor_RaiseToHighest(2),
-	 25:Floor_RaiseToNearest(2),
+	 20:Floor_LowerByValue(3,4),
+	 21:Floor_LowerToLowest(2,3),
+	 22:Floor_LowerToNearest(2,3),
+	 23:Floor_RaiseByValue(3,5),
+	 24:Floor_RaiseToHighest(2,5),
+	 25:Floor_RaiseToNearest(2,4),
 	 26:Stairs_BuildDown(5),
 	 27:Stairs_BuildUp(5),
 	 28:Floor_RaiseAndCrush(3,4),
@ -39,21 +39,21 @@ special
 	 32:Stairs_BuildUpSync(4),
 	 33:ForceField(0),
 	 34:ClearForceField(1),
-	 35:Floor_RaiseByValueTimes8(3),
-	 36:Floor_LowerByValueTimes8(3),
-	 37:Floor_MoveToValue(3,4),
+	 35:Floor_RaiseByValueTimes8(3,5),
+	 36:Floor_LowerByValueTimes8(3,4),
+	 37:Floor_MoveToValue(3,5),
 	 38:Ceiling_Waggle(5),
 	 39:Teleport_ZombieChanger(2),
-	 40:Ceiling_LowerByValue(3),
-	 41:Ceiling_RaiseByValue(3),
+	 40:Ceiling_LowerByValue(3,5),
+	 41:Ceiling_RaiseByValue(3,4),
 	 42:Ceiling_CrushAndRaise(3,4),
 	 43:Ceiling_LowerAndCrush(3,4),
-	 44:Ceiling_CrushStop(1),
+	 44:Ceiling_CrushStop(1,2),
 	 45:Ceiling_CrushRaiseAndStay(3,4),
 	 46:Floor_CrushStop(1),
-	 47:Ceiling_MoveToValue(3,4),
+	 47:Ceiling_MoveToValue(3,5),
 //	 48:Sector_Attach3dMidtex
-	 49:GlassBreak(0,1),
+	 49:GlassBreak(0,2),
 //	 50:ExtraFloor_LightOnly
 	 51:Sector_SetLink(4),
 	 52:Scroll_Wall(5),
@ -65,15 +65,15 @@ special
 //	 58: Sector_CopyScroller
 	 59:Polyobj_OR_MoveToSpot(3),
 	 60:Plat_PerpetualRaise(3),
- 	 61:Plat_Stop(1),
+ 	 61:Plat_Stop(1,2),
 	 62:Plat_DownWaitUpStay(3),
 	 63:Plat_DownByValue(4),
 	 64:Plat_UpWaitDownStay(3),
 	 65:Plat_UpByValue(4),
-	 66:Floor_LowerInstant(3),
-	 67:Floor_RaiseInstant(3),
-	 68:Floor_MoveToValueTimes8(4),
-	 69:Ceiling_MoveToValueTimes8(4),
+	 66:Floor_LowerInstant(3,4),
+	 67:Floor_RaiseInstant(3,5),
+	 68:Floor_MoveToValueTimes8(4,5),
+	 69:Ceiling_MoveToValueTimes8(4,5),
 	 70:Teleport(1,3),
 	 71:Teleport_NoFog(1,4),
 	 72:ThrustThing(2,4),
@ -108,6 +108,10 @@ special
 //	101:Scroll_Texture_Right
 //	102:Scroll_Texture_Up
 //	103:Scroll_Texture_Down
+	104:Ceiling_CrushAndRaiseSilentDist(4,5),
+	105:Door_WaitRaise(4,5),
+	106:Door_WaitClose(3,4),
+	107:Line_SetPortalTarget(2),

 	109:Light_ForceLightning(1),
 	110:Light_RaiseByValue(2),
@ -143,6 +147,8 @@ special
 	143:Player_RemoveItem(2),			// Skulltag Functions
 	144:Player_GiveItem(2),				// Skulltag Functions
 	145:Player_SetTeam(1),				// Skulltag Functions
+	150:Line_SetHealth(2),
+	151:Sector_SetHealth(3),
 	152:Team_Score(2),					// Skulltag Functions
 	153:Team_GivePoints(3),				// Skulltag Functions
 	154:Teleport_NoStop(2, 3),
@ -176,14 +182,14 @@ special
 	188:Sector_SetCeilingScale(5),
 	189:Sector_SetFloorScale(5),
 	191:SetPlayerProperty(3),
-	192:Ceiling_LowerToHighestFloor(2),
-	193:Ceiling_LowerInstant(3),
-	194:Ceiling_RaiseInstant(3),
+	192:Ceiling_LowerToHighestFloor(2,5),
+	193:Ceiling_LowerInstant(3,5),
+	194:Ceiling_RaiseInstant(3,4),
 	195:Ceiling_CrushRaiseAndStayA(4,5),
 	196:Ceiling_CrushAndRaiseA(4,5),
 	197:Ceiling_CrushAndRaiseSilentA(4,5),
-	198:Ceiling_RaiseByValueTimes8(3),
-	199:Ceiling_LowerByValueTimes8(3),
+	198:Ceiling_RaiseByValueTimes8(3,4),
+	199:Ceiling_LowerByValueTimes8(3,5),
 	200:Generic_Floor(5),
 	201:Generic_Ceiling(5),
 	202:Generic_Door(5),
@ -198,8 +204,8 @@ special
 //	211:Transfer_CeilingLight,
 	212:Sector_SetColor(4,5),
 	213:Sector_SetFade(4),
-	214:Sector_SetDamage(3),
-	215:Teleport_Line(2),
+	214:Sector_SetDamage(3,5),
+	215:Teleport_Line(2,3),
 	216:Sector_SetGravity(3),
 	217:Stairs_BuildUpDoom(5),
 	218:Sector_SetWind(4),
@ -222,9 +228,9 @@ special
 	235:Floor_TransferTrigger(1),
 	236:Floor_TransferNumeric(1),
 	237:ChangeCamera(3),
-	238:Floor_RaiseToLowestCeiling(2),
+	238:Floor_RaiseToLowestCeiling(2,5),
 	239:Floor_RaiseByValueTxTy(3),
-	240:Floor_RaiseByTexture(2),
+	240:Floor_RaiseByTexture(2,4),
 	241:Floor_LowerToLowestTxTy(2),
 	242:Floor_LowerToHighest(3,4),
 	243:Exit_Normal(1),
@ -236,10 +242,46 @@ special
 	249:Door_CloseWaitOpen(3, 4),
 	250:Floor_Donut(3),
 	251:FloorAndCeiling_LowerRaise(3,4),
-	252:Ceiling_RaiseToNearest(2),
-	253:Ceiling_LowerToLowest(2),
-	254:Ceiling_LowerToFloor(2),
+	252:Ceiling_RaiseToNearest(2,3),
+	253:Ceiling_LowerToLowest(2,4),
+	254:Ceiling_LowerToFloor(2,5),
 	255:Ceiling_CrushRaiseAndStaySilA(4,5),
+
+	// These are specialized versions of the Generic_* specials which are defined for EE Extradata.
+	256:Floor_LowerToHighestEE(2, 3),
+	257:Floor_RaiseToLowest(2, 3),
+	258:Floor_LowerToLowestCeiling(2,3),
+	259:Floor_RaiseToCeiling(2, 5),
+	260:Floor_ToCeilingInstant(1, 4),
+	261:Floor_LowerByTexture(2, 3),
+	262:Ceiling_RaiseToHighest(2, 3),
+	263:Ceiling_ToHighestInstant(1, 3),
+	264:Ceiling_LowerToNearest(2, 4),
+	265:Ceiling_RaiseToLowest(2, 3),
+	266:Ceiling_RaiseToHighestFloor(2, 3),
+	267:Ceiling_ToFloorInstant(1, 4),
+	268:Ceiling_RaiseByTexture(2, 3),
+	269:Ceiling_LowerByTexture(2, 4),
+	270:Stairs_BuildDownDoom(5),
+	271:Stairs_BuildUpDoomSync(4),
+	272:Stairs_BuildDownDoomSync(4),
+	
+	// New additions can go above 255 now.
+	273:Stairs_BuildUpDoomCrush(5),
+	274:Door_AnimatedClose(2),
+	275:Floor_Stop(1),
+	276:Ceiling_Stop(1),
+	277:Sector_SetFloorGlow(5),
+	278:Sector_SetCeilingGlow(5),
+	279:Floor_MoveToValueAndCrush(4, 5),
+	280:Ceiling_MoveToValueAndCrush(4, 5),
+	281:Line_SetAutomapFlags(3),
+	282:Line_SetAutomapStyle(2),
+	
+	// new to Eternity
+//	300:Portal_Define(5),
+//	301:Line_QuickPortal(1),
+	
 	
 	// internal functions have negative values
 	-1:GetLineUDMFInt(2),
@ -292,7 +334,7 @@ special
 	-48:Sqrt(1),
 	-49:FixedSqrt(1),
 	-50:VectorLength(2),
-	-51:SetHUDClipRect(4,5),
+	-51:SetHUDClipRect(4,6),
 	-52:SetHUDWrapWidth(1),
 	-53:SetCVar(2),
 	-54:GetUserCVar(2),
@ -301,8 +343,8 @@ special
 	-57:SetCVarString(2),
 	-58:GetUserCVarString(2),
 	-59:SetUserCVarString(3),
-	-60:LineAttack(4,8),
-	-61:PlaySound(2,6),
+	-60:LineAttack(4,9),
+	-61:PlaySound(2,7),
 	-62:StopSound(1,2),
 	-63:strcmp(2,3),
 	-64:stricmp(2,3),
@ -321,6 +363,27 @@ special
 	-76:SetLineActivation(2),
 	-77:GetLineActivation(1),
 	-78:GetActorPowerupTics(2),
+	-79:ChangeActorAngle(2,3),
+	-80:ChangeActorPitch(2,3),
+	-81:GetArmorInfo(1),
+	-82:DropInventory(2),
+	-83:PickActor(5,8),
+	-84:IsPointerEqual(2,4),
+	-85:CanRaiseActor(1),
+	-86:SetActorTeleFog(3),
+	-87:SwapActorTeleFog(1),
+	-88:SetActorRoll(2),
+	-89:ChangeActorRoll(2,3),
+	-90:GetActorRoll(1),
+	-91:QuakeEx(8,16),
+	-92:Warp(6,11),
+	-93:GetMaxInventory(2),
+	-94:SetSectorDamage(2,5),
+	-95:SetSectorTerrain(3),
+	-96:SpawnParticle(1,16),
+	-97:SetMusicVolume(1),
+	-98:CheckProximity(3, 6),
+	-99:CheckActorState(2,3),
 	
 	// Zandronum's
 	-100:ResetMap(0),
@ -353,10 +416,54 @@ special
 	-127:SystemTime(0),
 	-128:GetTimeProperty(2,3),
 	-129:Strftime(2,3),
+	-130:SetDeadSpectator(2),
+	-131:SetActivatorToPlayer(1),
+	-132:SetCurrentGamemode(1),
+	-133:GetCurrentGamemode(0),
+	-134:SetGamemodeLimit(2),
+	-135:SetPlayerClass(3),
+	-136:SetPlayerChasecam(2),
+	-137:GetPlayerChasecam(1),
+	-138:SetPlayerScore(3),
+	-139:GetPlayerScore(2),
+	-140:InDemoMode(0),
+	-144:ExecuteClientScript(2,6),
+	-145:NamedExecuteClientScript(2,6),
+	-146:SendNetworkString(2,3),
+	-147:NamedSendNetworkString(2,3),
+	-148:GetChatMessage(2),
+	-149:GetMapRotationSize(0),
+	-150:GetMapRotationInfo(2),
+
+	// -1xx are reserved for Zandronum
+	-200:CheckClass(1),
+	-201:DamageActor(6), // [arookas]
+	-202:SetActorFlag(3),
+	-203:SetTranslation(2),
+	-204:GetActorFloorTexture(1),
+	-205:GetActorFloorTerrain(1),
+	-206:StrArg(1),
+	-207:Floor(1),
+	-208:Round(1),
+	-209:Ceil(1),
+	-210:ScriptCall(2, 100),	// ACS does not know varargs so use something large as maximum.
+	-211:StartSlideshow(1),
+	-212:GetSectorHealth(2),
+	-213:GetLineHealth(1),
+	
+	
+	// Eternity's
+	-300:GetLineX(3),
+	-301:GetLineY(3),
+	-302:SetAirFriction(1),
+	
+	// GZDoom OpenGL
+	-400:SetSectorGlow(6),
+	-401:SetFogDensity(2),
 	
 	// ZDaemon's
-	-19260:GetTeamScore(1),
-	-19261:SetTeamScore(2),
+	-19620:GetTeamScore(1),
+	-19621:SetTeamScore(2),
 	
 	-100000:__EndOfList__(10);
 	
--- a/Build/Scripting/Zandronum_ACS.cfg
+++ b/Build/Scripting/Zandronum_ACS.cfg
@ -131,6 +131,7 @@ keywords
 	Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)";
 	Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)";
 	EndDBTransaction = "void EndDBTransaction()";
+	ExecuteClientScript = "int ExecuteClientScript (int script, int client [, int arg0 [, int arg1 [, int arg2 [, int arg3]]]])\nEquivalent to ACS_ExecuteAlways, except that it only executes the script with the given arguments for one client.";
 	Exit_Normal = "Exit_Normal(pos)";
 	Exit_Secret = "Exit_Secret(pos)";
 	FadeRange = "void FadeRange(int red1, int green1, int blue1, fixed amount1, int red2, int green2, int blue2, fixed amount2, fixed seconds)\nSets the current flash to the first color set and then fades it to the second color set over the specified number of seconds.";
@ -194,8 +195,11 @@ keywords
 	GetActorZ = "fixed GetActorZ(int tid)";
 	GetAirSupply = "int GetAirSupply(int playernum)";
 	GetAmmoCapacity = "int GetAmmoCapacity(str classname)";
+	GetArmorInfo = "mixed GetArmorInfo(int infotype)";
 	GetArmorType = "int GetArmorType(str armortype, int playernum)";
 	GetChar = "int GetChar(str string, int index)";
+	GetChatMessage = "str GetChatMessage(int player, int offset);\nReturns the last chat message from a player, or the server via RCON.";
+	GetCurrentGamemode = "str GetCurrentGamemode()\nReturns the current game mode as a string.";
 	GetCVar = "int GetCVar(str cvar)";
 	GetCVarString = "str GetCVarString(str cvar)";
 	GetDBEntries = "resource GetDBEntries(str namespace)";
@ -213,10 +217,14 @@ keywords
 	GetLineRowOffset = "int GetLineRowOffset()";
 	GetLineUDMFFixed = "fixed GetLineUDMFFixed(int lineid, str key)";
 	GetLineUDMFInt = "int GetLineUDMFInt(int lineid, str key)";
+	GetMapRotationInfo = "int GetMapRotationInfo(int position, int info)\nRetrieves information on a particular entry in the map rotation, indicated by the position parameter. Use 0 to get information on the current map (printed in green when the maplist console command is used).";
+	GetMapRotationSize = "int GetMapRotationSize()\nReturns the number of map entries that are currently in the map rotation.";
 	GetPlayerAccountName = "str GetPlayerAccountName(int player)";
+	GetPlayerChasecam = "int GetPlayerChasecam(int player)\nChecks if player is currently using the chasecam cheat, which can be toggled on or off by the chase console command or SetPlayerChasecam.";
 	GetPlayerInfo = "int GetPlayerInfo(int playernumber, int playerinfo)";
 	GetPlayerInput = "int GetPlayerInput(int player, int input)";
 	GetPlayerLivesLeft = "int GetPlayerLivesLeft(int player)";
+	GetPlayerScore = "int GetPlayerScore(int player, int type)\nReturns the score of the player indicated by the player parameter.";
 	GetPolyobjX = "fixed GetPolyobjX(int polyid)";
 	GetPolyobjY = "fixed GetPolyobjY(int polyid)";
 	GetScreenHeight = "int GetScreenHeight()";
@ -247,6 +255,7 @@ keywords
 	IsMultiplayer = "bool IsMultiplayer()";
 	IsOneFlagCTF = "bool IsOneFlagCTF()";
 	IncrementDBEntry = "void IncrementDBEntry(str namespace, str key, int amount)";
+	InDemoMode = "int InDemoMode()\nThis function can be used to determine if a demo is currently being run or not.";
 	IsTIDUsed = "bool IsTIDUsed(int tid)";
 	KickFromGame = "bool KickFromGame(int player, str reason)";
 	Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
@ -272,9 +281,12 @@ keywords
 	LocalSetMusic = "void LocalSetMusic(str song[, int order[, int unused]])";
 	Log = "void Log(type:expression)\nLog will print something in the log area of the screen (top left), as well as logging it to the console.\nIt uses the same parameter format as the Print function.";
 	MorphActor = "int MorphActor(int tid, [str playerclass, [str monsterclass, [int duration, [int style, [str morphflash, [str unmorphflash]]]]]])";
+	NamedExecuteClientScript = "int NamedExecuteClientScript (str script, int client [, int arg0 [, int arg1 [, int arg2 [, int arg3]]]])\nEquivalent to ACS_NamedExecuteAlways, except that it only executes the script with the given arguments for one client.";
 	NamedRequestScriptPuke = "int NamedRequestScriptPuke(str script[, int arg0[, int arg1[, int arg2[, int arg3]]]])";
+	NamedSendNetworkString = "int NamedSendNetworkString (str script, str string [, int client])\nSends an ACS string from the server to the client(s), or from a client to the server, then executes a script on the receiver's end.";
 	NamedScriptWait = "void NamedScriptWait(str script)";
 	NoiseAlert = "NoiseAlert(target_tid, emiter_tid)";
+	PickActor = "bool PickActor(int source_tid, fixed angle, fixed pitch, fixed distance, int tid[, int actorMask = MF_SHOOTABLE[, int wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN[, bool forcetid = false]]])";
 	Pillar_Build = "Pillar_Build(tag, speed, height)";
 	Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush, crushmode)";
 	Pillar_Open = "Pillar_Open(tag, speed, fdist, cdist)";
@ -353,8 +365,10 @@ keywords
 	Sector_SetWind = "Sector_SetWind(tag, amount, angle, useline)";
 	SectorDamage = "void SectorDamage(int tag, int amount, str type, str protection_item, int flags)\nDoes the damage only when the function is called,\nand damages everything in the tagged sector.\nUses DAMAGE_ flags.";
 	SectorSound = "void SectorSound(str sound, int volume)";
+	SendNetworkString = "int SendNetworkString (int script, str string [, int client])\nSends an ACS string from the server to the client(s), or from a client to the server, then executes a script on the receiver's end.";
 	SendToCommunicator = "SendToCommunicator(voc_id, front_only, indentify, nolog)";
 	SetActivator = "int SetActivator(int tid[, int pointer_selector])\nThis changes the activator of the script to the first actor found with the specified tid.\ntid: TID of the new activator.\npointer_selector: the pointer of the TID to set as the new activator (use AAPTR_ flags).";
+	SetActivatorToPlayer = "int SetActivatorToPlayer(int playernumber)\nSets the activator of the script to a specific player.";
 	SetActivatorToTarget = "bool SetActivatorToTarget(int tid)\nThis changes the activator of the script to the current target\nof the first actor found with the specified tid.\nUsing a tid of 0 uses the current activator's target.";
 	SetActorAngle = "void SetActorAngle(int tid, fixed angle)\nSets the actor's angle.\nangle: a fixed point angle in the range of 0.0 to 1.0 (N = 0.25, W = 0.5, S = 0.75, E = 1.0).";
 	SetActorPitch = "void SetActorPitch(int tid, int pitch)\nSets the actor's Pitch.\npitch: a fixed point angle in the range of 0.0 to 1.0.";
@ -368,12 +382,15 @@ keywords
 	SetAmmoCapacity = "void SetAmmoCapacity(str typename, int maxamount)\nSets the maximum amount of a type of ammo the player can carry.";
 	SetCameraToTexture = "void SetCameraToTexture(int cameratid, str texturename, int fov)\nBinds the named texture to the specified camera\n(which does not have to be an actual camera thing).\nThe texture used must be defined as a “cameratexture” in the ANIMDEFS lump.";
 	SetCeilingTrigger = "void SetCeilingTrigger(int tag, int height, int special[, int arg1[, int arg2[, int arg3[, int arg4[, int arg5]]]]])\nWhen the ceiling specified by tag moves the specified height,\nspecial(arg1, arg2, arg3, arg4, arg5) will be activated.";
+	SetCurrentGamemode = "int SetCurrentGamemode(str gamemode)\nChanges the current game mode, which also resets the game upon success.";
 	SetCVar = "bool SetCVar(str cvar, int value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
 	SetCVarString = "bool SetCVarString(str cvar, str value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
+	SetDeadSpectator = "int SetDeadSpectator(int playernumber, bool state);\nTurns a player that is alive into a dead spectator or vice versa.\nThis function will only effect dead spectators or players that are alive, not true spectators.";
 	SetDBEntry = "int SetDBEntry(table, variable, value)";
 	SetDBEntryString = "void SetDBEntryString(str namespace, str key, str value)";
 	SetFloorTrigger = "SetFloorTrigger(tag, height, special, arg1, arg2, arg3, arg4, arg5)";
 	SetFont = "void SetFont(str fontlump)\nSets the current font (only within the script) to fontlump";
+	SetGamemodeLimit = "void SetGamemodeLimit(int limit, int value)";
 	SetGlobalFogParameter = "SetGlobalFogParameter(property, value)";
 	SetGravity = "void SetGravity(fixed amount)\nThis function sets the global gravity of an entire level.\nDefault is 800.0";
 	SetHUDClipRect = "void SetHUDClipRect(int x, int y, int width, int height[, int wrapwidth = 0])\nSets the clipping rectangle for future HUD messages.";
@ -388,8 +405,11 @@ keywords
 	SetMarineWeapon = "void SetMarineWeapon(int tid, int weapon)\nSets a Scripted Marine's weapon on the fly.\nweapon: one of MARINEWEAPON_ flags";
 	SetMugShotState = "void SetMugShotState(str state)\nSets the state of the mug shot in SBARINFO status bars.\nThe state you set will only be interrupted by damage or if the player\npicks up a weapon, provided the mugshot supports it.";
 	SetMusic = "void SetMusic(str song[, int order[, int unused]])";
+	SetPlayerChasecam = "int SetPlayerChasecam(int player, bool enable)\nEnables or disables a player's chasecam cheat, which can also be toggled on or off by the chase console command.";
+	SetPlayerClass = "int SetPlayerClass(int player, str class, bool respawn)\nChanges the class a player is currently using.";
 	SetPlayerLivesLeft = "int SetPlayerLivesLeft(int player, int amount)";
 	SetPlayerProperty = "SetPlayerProperty(who, set, which)";
+	SetPlayerScore = "int SetPlayerScore(int player, int type, int value)\nChanges the score of a player.";
 	SetPointer = "bool SetPointer(int assign_slot, int tid[, int pointer_selector[, int flags]])\nSet the value of one of the caller's stored pointers.";
 	SetResultValue = "void SetResultValue(int value)";
 	SetSkyScrollSpeed = "void SetSkyScrollSpeed(int sky, fixed skyspeed)\nChanges the scrolling speed of a sky.\nThis is useful in conjunction with ChangeSky.\nsky: either 1 or 2.\nskyspeed: the desired scrolling speed.";
@ -484,6 +504,7 @@ keywords
 	UsePuzzleItem = "UsePuzzleItem(item, script, arg1, arg2, arg3)";
 	VectorAngle = "fixed VectorAngle(int x, int y)";
 	VectorLength = "int VectorLength(int x, int y)";
+	Warp = "bool Warp(int destinationtid, fixed xofs, fixed yofs, fixed zofs, int angle, int flags[, str success_state[, bool exactstate]])";
 	//WHITERETURN = "Script expression WhiteReturn";
 }

@ -528,6 +549,9 @@ properties

 constants
 {
+	AAPTR_DAMAGE_INFLICTOR;
+	AAPTR_DAMAGE_SOURCE;
+	AAPTR_DAMAGE_TARGET;
 	AAPTR_DEFAULT;
 	AAPTR_FRIENDPLAYER;
 	AAPTR_MASTER;
@ -596,6 +620,11 @@ constants
 	APROP_TracerTID;
 	APROP_ViewHeight;
 	APROP_Waterlevel;
+	ARMORINFO_CLASSNAME;
+	ARMORINFO_MAXABSORB;
+	ARMORINFO_MAXFULLABSORB;
+	ARMORINFO_SAVEAMOUNT;
+	ARMORINFO_SAVEPERCENT;
 	ATTN_IDLE;
 	ATTN_NONE;
 	ATTN_NORM;
@ -718,6 +747,25 @@ constants
 	FOGP_DENSITY;
 	FOGP_OUTSIDEDENSITY;
 	FOGP_SKYFOG;
+	GAMEEVENT_ACTOR_ARMORDAMAGED;
+	GAMEEVENT_ACTOR_DAMAGED;
+	GAMEEVENT_ACTOR_SPAWNED;
+	GAMEEVENT_CAPTURES;
+	GAMEEVENT_CHAT;
+	GAMEEVENT_MEDALS;
+	GAMEEVENT_PLAYERCONNECT;
+	GAMEEVENT_PLAYERFRAGS;
+	GAMEEVENT_RETURNS;
+	GAMEEVENT_ROUND_ABORTED;
+	GAMEEVENT_ROUND_ENDS;
+	GAMEEVENT_ROUND_STARTS;
+	GAMEEVENT_TOUCHES;
+	GAMEMODE_DUELS;
+	GAMEMODE_FRAGS;
+	GAMEMODE_POINTS;
+	GAMEMODE_TIME;
+	GAMEMODE_WAVES;
+	GAMEMODE_WINS;
 	GAMESTATE_COUNTDOWN;
 	GAMESTATE_INPROGRESS;
 	GAMESTATE_INRESULTSEQUENCE;
@ -809,6 +857,11 @@ constants
 	LEVELINFO_TOTAL_SECRETS;
 	LINE_BACK;
 	LINE_FRONT;
+	MAPROTATION_LumpName;
+	MAPROTATION_MaxPlayers;
+	MAPROTATION_MinPlayers;
+	MAPROTATION_Name;
+	MAPROTATION_Used;
 	MARINEWEAPON_BerserkFist;
 	MARINEWEAPON_BFG;
 	MARINEWEAPON_Chaingun;
@ -821,6 +874,65 @@ constants
 	MARINEWEAPON_RocketLauncher;
 	MARINEWEAPON_Shotgun;
 	MARINEWEAPON_SuperShotgun;
+	MF_AMBUSH; 
+	MF_CORPSE; 
+	MF_COUNTITEM;
+	MF_COUNTKILL;
+	MF_DROPOFF; 
+	MF_DROPPED; 
+	MF_FLOAT; 
+	MF_FRIENDLY;
+	MF_ICECORPSE;
+	MF_INBOUNCE;
+	MF_INCHASE; 
+	MF_INFLOAT; 
+	MF_JUSTATTACKED;
+	MF_JUSTHIT;
+	MF_MISSILE; 
+	MF_NOBLOCKMAP;
+	MF_NOBLOOD; 
+	MF_NOCLIP; 
+	MF_NOGRAVITY;
+	MF_NOLIFTDROP;
+	MF_NOSECTOR;
+	MF_NOTDMATCH;
+	MF_PICKUP; 
+	MF_SHADOW; 
+	MF_SHOOTABLE;
+	MF_SKULLFLY;
+	MF_SOLID; 
+	MF_SPAWNCEILING;
+	MF_SPAWNSOUNDSOURCE;
+	MF_SPECIAL; 
+	MF_STEALTH;
+	MF_TELEPORT;
+	MF_UNMORPHED; 	
+	ML_3DMIDTEX;
+	ML_ADDTRANS; 
+	ML_BLOCKEVERYTHING; 
+	ML_BLOCKHITSCAN;
+	ML_BLOCKING; 
+	ML_BLOCKMONSTERS; 
+	ML_BLOCKPROJECTILE;
+	ML_BLOCKSIGHT;
+	ML_BLOCKUSE;
+	ML_BLOCK_FLOATERS;
+	ML_BLOCK_PLAYERS; 
+	ML_CHECKSWITCHRANGE;
+	ML_CLIP_MIDTEX;
+	ML_DONTDRAW; 
+	ML_DONTPEGBOTTOM; 
+	ML_DONTPEGTOP; 
+	ML_FIRSTSIDEONLY;
+	ML_MAPPED; 
+	ML_MONSTERSCANACTIVATE; 
+	ML_RAILING; 
+	ML_REPEAT_SPECIAL; 
+	ML_SECRET; 
+	ML_SOUNDBLOCK; 
+	ML_TWOSIDED; 
+	ML_WRAP_MIDTEX;
+	ML_ZONEBOUNDARY;
 	MOD_BARREL;
 	MOD_BFG_BOOM;
 	MOD_BFG_SPLASH;
@ -880,6 +992,8 @@ constants
 	NOT_TOP;
 	OFF;
 	ON;
+	PICKAF_FORCETID;
+	PICKAF_RETURNTID;
 	PLAYERINFO_AIMDIST;
 	PLAYERINFO_COLOR;
 	PLAYERINFO_DESIREDFOV;
@ -911,6 +1025,15 @@ constants
 	PTROP_NOSAFEGUARDS;
 	PTROP_UNSAFEMASTER;
 	PTROP_UNSAFETARGET;
+	SCORE_DEATHS;
+	SCORE_FRAGS;
+	SCORE_ITEMS;
+	SCORE_KILLS;
+	SCORE_POINTS;
+	SCORE_RANK;
+	SCORE_SECRETS;
+	SCORE_SPREAD;
+	SCORE_WINS;
 	SCROLL;
 	SCROLL_AND_CARRY;
 	SDF_ABSANGLE;
@ -1314,6 +1437,17 @@ constants
 	TPROP_TextColor;
 	TPROP_WinCount;
 	TPROP_WinnerTheme;
+	TRANSLATION_ICE;
 	TRUE;
+	WARPF_ABSOLUTEANGLE;
+	WARPF_ABSOLUTEOFFSET;
+	WARPF_COPYINTERPOLATION;
+	WARPF_INTERPOLATE;
+	WARPF_NOCHECKPOSITION;
+	WARPF_STOP;
+	WARPF_TESTONLY;
+	WARPF_TOFLOOR;
+	WARPF_USECALLERANGLE;
+	WARPF_WARPINTERPOLATION;
 	YES;
 }