- Updated ACC with current Skulltag definitions. (LSPEC6[DIRECT] has become a more useful

GetInvasionWave/GetInvasionState combination, it has a few more line specials, and there
  are several more spawntypes added to zdefs.acs.

SVN r1552 (trunk)

pcode.h

@@ -185,8 +185,8 @@ typedef enum
 	PCD_BLUETEAMSCORE,
 	PCD_REDTEAMSCORE,
 	PCD_ISONEFLAGCTF,
-	PCD_LSPEC6,				// [RH] LSPEC6 is never actually used.
-	PCD_LSPEC6DIRECT,		// Should these be removed?
+	PCD_GETINVASIONWAVE,
+	PCD_GETINVASIONSTATE,
 	PCD_PRINTNAME,
 	PCD_MUSICCHANGE,
 	PCD_CONSOLECOMMANDDIRECT,

symbol.c

@@ -100,6 +100,8 @@ static internFuncDef_t InternalFunctions[] =
 	{ "bluescore", PCD_NOP, PCD_BLUETEAMSCORE, 0, 0, 0, YES, NO },
 	{ "redscore", PCD_NOP, PCD_REDTEAMSCORE, 0, 0, 0, YES, NO },
 	{ "isoneflagctf", PCD_NOP, PCD_ISONEFLAGCTF, 0, 0, 0, YES, NO },
+	{ "getinvasionwave", PCD_NOP, PCD_GETINVASIONWAVE, 0, 0, 0, YES, NO },
+	{ "getinvasionstate", PCD_NOP, PCD_GETINVASIONSTATE, 0, 0, 0, YES, NO },
 	{ "music_change", PCD_NOP, PCD_MUSICCHANGE, 2, 0, 0, NO, NO },
 	{ "consolecommand", PCD_CONSOLECOMMANDDIRECT, PCD_CONSOLECOMMAND, 3, 2|4, 0, NO, NO },
 	{ "singleplayer", PCD_NOP, PCD_SINGLEPLAYER, 0, 0, 0, YES, NO },

zdefs.acs

@@ -623,6 +623,115 @@
 #define ACTOR_GENERIC			256
 
 
+// ==========================================================================
+// Skulltag Definitions
+// ==========================================================================
+
+// Skulltag Teams -----------------------------------------------------------
+#define TEAM_BLUE				0
+#define TEAM_RED				1
+#define NO_TEAM					2
+
+// Skulltag Invasion --------------------------------------------------------
+#define IS_WAITINGFORPLAYERS	0
+#define IS_FIRSTCOUNTDOWN		1
+#define IS_INPROGRESS			2
+#define IS_BOSSFIGHT			3
+#define IS_WAVECOMPLETE			4
+#define IS_COUNTDOWN			5
+
+
+#define T_GRENADE				216
+#define T_BFG10KSHOT			217
+#define T_DARKIMPFIREBALL		218
+#define T_CACOLANTERNSHOT		219
+#define T_ABADDONSHOT			221
+
+// Skulltag Monsters --------------------------------------------------------
+#define T_DARKIMP				155
+#define T_BLOODDEMON			156
+#define T_SSGGUY				157
+#define T_HECTEBUS				158
+#define T_CACOLANTERN			159
+#define T_BELPHEGOR				215
+#define T_ABADDON				220
+
+// Skulltag Weapons ---------------------------------------------------------
+#define T_PISTOL				162
+#define T_GRENADELAUNCHER		163
+#define T_RAILGUN				164
+#define T_BFG10000				165
+#define T_MINIGUN				214
+
+// Skulltag Armor/Health Items ----------------------------------------------
+#define T_MAXHEALTHBONUS		166
+#define T_MASARMORBONUS			167
+#define T_REDARMOR				168
+
+// Skulltag Powerups --------------------------------------------------------
+#define T_TURBOSPHERE			169
+#define T_ANTIGRAVBELT			170
+#define T_TIMEFREEZER			171
+#define T_INFRAGOGGLES			172
+#define T_INFRATRACKER			173
+#define T_TRANSLUCENCY			174
+#define T_DOOMSPHERE			175
+#define T_RANDOMPOWERUP			176
+
+// Skulltag Flags -----------------------------------------------------------
+#define T_BLUEFLAG				177
+#define T_REDFLAG				178
+#define T_WHITEFLAG				179
+
+// Skulltag Runes -----------------------------------------------------------
+#define T_STRENGTH				180
+#define T_RAGE					181
+#define T_DRAIN					182
+#define T_SPREAD				183
+#define T_RESISTANCE			184
+#define T_REGENERATION			185
+#define T_PROSPERITY			186
+#define T_REFLECTION			187
+#define T_HIGHJUMP				188
+#define T_HASTE					189
+
+// Skulltag Dead Things -----------------------------------------------------
+#define T_DEADCYBERDEMON		190
+
+// Skulltag Misc ------------------------------------------------------------
+#define T_BOBBINGSKULLINFLAMES	191
+
+// Skulltag Impaling Things -------------------------------------------------
+#define T_IMPALINGSPIKE			192
+#define T_IMPALINGSPIKECGUN		193
+#define T_IMPALINGSPIKEZOMB		194
+
+// Skulltag Statues ---------------------------------------------------------
+#define T_IMPSTATUE				195
+#define T_DEMONSTATUE			196
+#define T_ARCHSTATUE			197
+#define T_BARONSTATUE			198
+#define T_CYBERDEMONSTATUE		199
+#define T_MASSMOUTHSTATUE		200
+
+// More Skulltag Misc -------------------------------------------------------
+#define T_GREYSTALAGMITE		201
+#define T_SHORTGREYPILLAR		202
+#define T_TALLGREYPILLAR		203
+#define T_GREYPILLARHEART		204
+#define T_TALLGOTHICPILLAR		205
+#define T_REVENANTHAND			206
+#define T_IMPHEAD				207
+#define T_HISSY					208
+
+// Skulltag Score Pillars ---------------------------------------------------
+#define T_HELLPILLAR			209
+#define T_GOTHICPILLAR			210
+#define T_STARBASEPILLAR		211
+#define T_MILITARYPILLAR		212
+#define T_LABORTORYPILLAR		213
+
+
 // Events when you have input grabbed
 
 #define EV_KeyDown				1	// data1: unshifted ASCII, data2: shifted ASCII

zspecial.acs

@@ -115,6 +115,13 @@ special
 	139:Thing_SpawnFacing(2,4),
 	154:Teleport_NoStop(2, 3),
 
+	// Skulltag Functions
+	143:Player_RemoveItem(2),
+	144:Player_GiveItem(2),
+	145:Player_SetTeam(1),
+	152:Team_Score(2),
+	153:Team_GivePoints(3),
+
 	158:FS_Execute(1,4),				// GZDoom only!
 	159:Sector_SetPlaneReflection(3),	// GZDoom only!
 	//160:Sector_Set3DFloor				// GZDoom/Vavoom