stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 15:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt linedef executor triggers that don't involve sector effects to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-09-23 10:21:53 +02:00
parent a61343bc8b
commit 280d23782c
5 changed files with 456 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

260
extras/conf/udb/Includes/SRB222_linedefs.cfg
View file

@ -2504,6 +2504,266 @@ udmf
}
}
linedeftrigger
{
title = "Linedef Executor Trigger";
323
{
title = "NiGHTSerize";
prefix = "(323)";
arg0
{
title = "Trigger type";
type = 11;
enum
{
0 = "Each time";
1 = "Once";
}
}
arg1
{
title = "Mare number";
}
arg2
{
title = "Lap number";
}
arg3
{
title = "Mare comparison";
type = 11;
enum = "comparison";
}
arg4
{
title = "Lap comparison";
type = 11;
enum = "comparison";
}
arg5
{
title = "Compared player";
type = 11;
enum
{
0 = "Fastest";
1 = "Slowest";
2 = "Triggerer";
}
}
arg6
{
title = "NiGHTS check";
type = 11;
enum
{
0 = "No check";
1 = "Trigger if player was not NiGHTS";
2 = "Trigger if player was already NiGHTS";
}
}
arg7
{
title = "Flags";
type = 12;
enum
{
1 = "Only count bonus time laps";
2 = "Only trigger if final mare completed";
}
}
}
325
{
title = "De-NiGHTSerize";
prefix = "(325)";
arg0
{
title = "Trigger type";
type = 11;
enum
{
0 = "Each time";
1 = "Once";
}
}
arg1
{
title = "Mare number";
}
arg2
{
title = "Lap number";
}
arg3
{
title = "Mare comparison";
type = 11;
enum = "comparison";
}
arg4
{
title = "Lap comparison";
type = 11;
enum = "comparison";
}
arg5
{
title = "Compared player";
type = 11;
enum
{
0 = "Fastest";
1 = "Slowest";
2 = "Triggerer";
}
}
arg6
{
title = "NiGHTS check";
type = 11;
enum
{
0 = "No check";
1 = "Trigger if nobody is now NiGHTS";
2 = "Trigger if somebody is still NiGHTS";
}
}
arg7
{
title = "Only bonus laps?";
type = 11;
enum = "noyes";
}
}
327
{
title = "NiGHTS Lap";
prefix = "(327)";
arg0
{
title = "Trigger type";
type = 11;
enum
{
0 = "Each time";
1 = "Once";
}
}
arg1
{
title = "Mare number";
}
arg2
{
title = "Lap number";
}
arg3
{
title = "Mare comparison";
type = 11;
enum = "comparison";
}
arg4
{
title = "Lap comparison";
type = 11;
enum = "comparison";
}
arg5
{
title = "Compared player";
type = 11;
enum
{
0 = "Fastest";
1 = "Slowest";
2 = "Triggerer";
}
}
arg6
{
title = "Only bonus laps?";
type = 11;
enum = "noyes";
}
}
329
{
title = "Ideya Capture Touch";
prefix = "(329)";
arg0
{
title = "Trigger type";
type = 11;
enum
{
0 = "Each time";
1 = "Once";
}
}
arg1
{
title = "Mare number";
}
arg2
{
title = "Lap number";
}
arg3
{
title = "Mare comparison";
type = 11;
enum = "comparison";
}
arg4
{
title = "Lap comparison";
type = 11;
enum = "comparison";
}
arg5
{
title = "Compared player";
type = 11;
enum
{
0 = "Fastest";
1 = "Slowest";
2 = "Triggerer";
}
}
arg6
{
title = "Spheres check";
type = 11;
enum
{
0 = "Trigger if enough spheres";
1 = "Trigger if not enough spheres";
2 = "Trigger regardless of spheres";
}
}
arg7
{
title = "Flags";
type = 12;
enum
{
1 = "Only count bonus time laps";
2 = "Trigger upon entering Ideya Capture";
}
}
}
399
{
title = "Level Load";
prefix = "(399)";
}
}
linedefexecsector
{
title = "Linedef Executor (sector)";

7
extras/conf/udb/Includes/SRB222_misc.cfg
View file

@ -488,6 +488,13 @@ enums
1 = "Accelerative";
2 = "Displacement";
}
comparison
{
0 = "Equal";
1 = "Less than or equal";
2 = "Greater than or equal";
}
}
//Default things filters

73
src/p_setup.c
View file

@ -3682,6 +3682,79 @@ static void P_ConvertBinaryMap(void)
else
lines[i].args[1] = 255;
break;
case 323: //NiGHTSerize - Each time
case 324: //NiGHTSerize - Once
case 325: //DeNiGHTSerize - Each time
case 326: //DeNiGHTSerize - Once
case 327: //NiGHTS lap - Each time
case 328: //NiGHTS lap - Once
case 329: //Ideya capture touch - Each time
case 330: //Ideya capture touch - Once
lines[i].args[0] = (lines[i].special + 1) % 2;
lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
if (lines[i].flags & ML_NOCLIMB)
lines[i].args[3] = TMC_LTE;
else if (lines[i].flags & ML_BLOCKMONSTERS)
lines[i].args[3] = TMC_GTE;
else
lines[i].args[3] = TMC_EQUAL;
if (lines[i].flags & ML_EFFECT1)
lines[i].args[4] = TMC_LTE;
else if (lines[i].flags & ML_EFFECT2)
lines[i].args[4] = TMC_GTE;
else
lines[i].args[4] = TMC_EQUAL;
if (lines[i].flags & ML_DONTPEGBOTTOM)
lines[i].args[5] = TMNP_SLOWEST;
else if (lines[i].flags & ML_EFFECT4)
lines[i].args[5] = TMNP_TRIGGERER;
else
lines[i].args[5] = TMNP_FASTEST;
if (lines[i].special % 2 == 0)
lines[i].special--;
if (lines[i].special == 323)
{
if (lines[i].flags & ML_TFERLINE)
lines[i].args[6] = TMN_FROMNONIGHTS;
else if (lines[i].flags & ML_DONTPEGTOP)
lines[i].args[6] = TMN_FROMNIGHTS;
else
lines[i].args[6] = TMN_ALWAYS;
if (lines[i].flags & ML_EFFECT3)
lines[i].args[7] |= TMN_BONUSLAPS;
if (lines[i].flags & ML_BOUNCY)
lines[i].args[7] |= TMN_LEVELCOMPLETION;
}
else if (lines[i].special == 325)
{
if (lines[i].flags & ML_TFERLINE)
lines[i].args[6] = TMD_NOBODYNIGHTS;
else if (lines[i].flags & ML_DONTPEGTOP)
lines[i].args[6] = TMD_SOMEBODYNIGHTS;
else
lines[i].args[6] = TMD_ALWAYS;
lines[i].args[7] = !!(lines[i].flags & ML_EFFECT3);
}
else if (lines[i].special == 327)
lines[i].args[6] = !!(lines[i].flags & ML_EFFECT3);
else
{
if (lines[i].flags & ML_DONTPEGTOP)
lines[i].args[6] = TMS_ALWAYS;
else if (lines[i].flags & ML_BOUNCY)
lines[i].args[6] = TMS_IFNOTENOUGH;
else
lines[i].args[6] = TMS_IFENOUGH;
if (lines[i].flags & ML_EFFECT3)
lines[i].args[7] |= TMI_BONUSLAPS;
if (lines[i].flags & ML_TFERLINE)
lines[i].args[7] |= TMI_ENTER;
}
break;
case 400: //Set tagged sector's floor height/texture
case 401: //Set tagged sector's ceiling height/texture
lines[i].args[0] = tag;

125
src/p_spec.c
View file

@ -1223,7 +1223,7 @@ void P_RunNightserizeExecutors(mobj_t *actor)
for (i = 0; i < numlines; i++)
{
if (lines[i].special == 323 || lines[i].special == 324)
if (lines[i].special == 323)
P_RunTriggerLinedef(&lines[i], actor, NULL);
}
}
@ -1237,7 +1237,7 @@ void P_RunDeNightserizeExecutors(mobj_t *actor)
for (i = 0; i < numlines; i++)
{
if (lines[i].special == 325 || lines[i].special == 326)
if (lines[i].special == 325)
P_RunTriggerLinedef(&lines[i], actor, NULL);
}
}
@ -1251,7 +1251,7 @@ void P_RunNightsLapExecutors(mobj_t *actor)
for (i = 0; i < numlines; i++)
{
if (lines[i].special == 327 || lines[i].special == 328)
if (lines[i].special == 327)
P_RunTriggerLinedef(&lines[i], actor, NULL);
}
}
@ -1265,13 +1265,19 @@ void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean e
for (i = 0; i < numlines; i++)
{
if ((lines[i].special == 329 || lines[i].special == 330)
&& ((entering && (lines[i].flags & ML_TFERLINE))
|| (!entering && !(lines[i].flags & ML_TFERLINE)))
&& ((lines[i].flags & ML_DONTPEGTOP)
|| (enoughspheres && !(lines[i].flags & ML_BOUNCY))
|| (!enoughspheres && (lines[i].flags & ML_BOUNCY))))
P_RunTriggerLinedef(&lines[i], actor, NULL);
if (lines[i].special != 329)
continue;
if (!!(lines[i].args[7] & TMI_ENTER) != entering)
continue;
if (lines[i].args[6] == TMS_IFENOUGH && !enoughspheres)
continue;
if (lines[i].args[6] == TMS_IFNOTENOUGH && enoughspheres)
continue;
P_RunTriggerLinedef(&lines[i], actor, NULL);
}
}
@ -1351,27 +1357,42 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
INT16 specialtype = triggerline->special;
size_t i;
UINT8 inputmare = max(0, min(255, sides[triggerline->sidenum[0]].textureoffset>>FRACBITS));
UINT8 inputlap = max(0, min(255, sides[triggerline->sidenum[0]].rowoffset>>FRACBITS));
UINT8 inputmare = max(0, min(255, triggerline->args[1]));
UINT8 inputlap = max(0, min(255, triggerline->args[2]));
boolean ltemare = triggerline->flags & ML_NOCLIMB;
boolean gtemare = triggerline->flags & ML_BLOCKMONSTERS;
boolean ltelap = triggerline->flags & ML_EFFECT1;
boolean gtelap = triggerline->flags & ML_EFFECT2;
textmapcomparison_t marecomp = triggerline->args[3];
textmapcomparison_t lapcomp = triggerline->args[4];
textmapnightsplayer_t checkplayer = triggerline->args[5];
boolean lapfrombonustime = triggerline->flags & ML_EFFECT3;
boolean perglobalinverse = triggerline->flags & ML_DONTPEGBOTTOM;
boolean perglobal = !(triggerline->flags & ML_EFFECT4) && !perglobalinverse;
boolean lapfrombonustime;
boolean donomares = triggerline->flags & ML_BOUNCY; // nightserize: run at end of level (no mares)
boolean fromnonights = triggerline->flags & ML_TFERLINE; // nightserize: from non-nights // denightserize: all players no nights
boolean fromnights = triggerline->flags & ML_DONTPEGTOP; // nightserize: from nights // denightserize: >0 players are nights
boolean donomares = (specialtype == 323) && (triggerline->args[7] & TMN_LEVELCOMPLETION); // nightserize: run at end of level (no mares)
UINT8 currentmare = UINT8_MAX;
UINT8 currentlap = UINT8_MAX;
// Set lapfrombonustime
switch (specialtype)
{
case 323:
lapfrombonustime = !!(triggerline->args[7] & TMN_BONUSLAPS);
break;
case 325:
lapfrombonustime = !!(triggerline->args[7]);
break;
case 327:
lapfrombonustime = !!(triggerline->args[6]);
break;
case 329:
lapfrombonustime = !!(triggerline->args[7] & TMI_BONUSLAPS);
break;
default:
lapfrombonustime = false;
break;
}
// Do early returns for Nightserize
if (specialtype >= 323 && specialtype <= 324)
if (specialtype == 323)
{
// run only when no mares are found
if (donomares && P_FindLowestMare() != UINT8_MAX)
@ -1382,7 +1403,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
return false;
// run only if player is nightserizing from non-nights
if (fromnonights)
if (triggerline->args[6] == TMN_FROMNONIGHTS)
{
if (!actor->player)
return false;
@ -1390,7 +1411,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
return false;
}
// run only if player is nightserizing from nights
else if (fromnights)
else if (triggerline->args[6] == TMN_FROMNIGHTS)
{
if (!actor->player)
return false;
@ -1400,8 +1421,8 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
}
// Get current mare and lap (and check early return for DeNightserize)
if (perglobal || perglobalinverse
|| (specialtype >= 325 && specialtype <= 326 && (fromnonights || fromnights)))
if (checkplayer != TMNP_TRIGGERER
|| (specialtype == 325 && triggerline->args[6] != TMD_ALWAYS))
{
UINT8 playersarenights = 0;
@ -1412,19 +1433,19 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
continue;
// denightserize: run only if all players are not nights
if (specialtype >= 325 && specialtype <= 326 && fromnonights
if (specialtype == 325 && triggerline->args[6] == TMD_NOBODYNIGHTS
&& players[i].powers[pw_carry] == CR_NIGHTSMODE)
return false;
// count number of nights players for denightserize return
if (specialtype >= 325 && specialtype <= 326 && fromnights
if (specialtype == 325 && triggerline->args[6] == TMD_SOMEBODYNIGHTS
&& players[i].powers[pw_carry] == CR_NIGHTSMODE)
playersarenights++;
lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap;
// get highest mare/lap of players
if (perglobal)
if (checkplayer == TMNP_FASTEST)
{
if (players[i].mare > currentmare || currentmare == UINT8_MAX)
{
@ -1436,7 +1457,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
currentlap = lap;
}
// get lowest mare/lap of players
else if (perglobalinverse)
else if (checkplayer == TMNP_SLOWEST)
{
if (players[i].mare < currentmare || currentmare == UINT8_MAX)
{
@ -1450,12 +1471,12 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
}
// denightserize: run only if >0 players are nights
if (specialtype >= 325 && specialtype <= 326 && fromnights
if (specialtype == 325 && triggerline->args[6] == TMD_SOMEBODYNIGHTS
&& playersarenights < 1)
return false;
}
// get current mare/lap from triggering player
else if (!perglobal && !perglobalinverse)
else if (checkplayer == TMNP_TRIGGERER)
{
if (!actor->player)
return false;
@ -1467,13 +1488,13 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor)
return false; // special case: player->marebonuslap is 0 until passing through on bonus time. Don't trigger lines looking for inputlap 0.
// Compare current mare/lap to input mare/lap based on rules
if (!(specialtype >= 323 && specialtype <= 324 && donomares) // don't return false if donomares and we got this far
&& ((ltemare && currentmare > inputmare)
|| (gtemare && currentmare < inputmare)
|| (!ltemare && !gtemare && currentmare != inputmare)
|| (ltelap && currentlap > inputlap)
|| (gtelap && currentlap < inputlap)
|| (!ltelap && !gtelap && currentlap != inputlap))
if (!donomares // don't return false if donomares and we got this far
&& ((marecomp == TMC_LTE && currentmare > inputmare)
|| (marecomp == TMC_GTE && currentmare < inputmare)
|| (marecomp == TMC_EQUAL && currentmare != inputmare)
|| (lapcomp == TMC_LTE && currentlap > inputlap)
|| (lapcomp == TMC_GTE && currentlap < inputlap)
|| (lapcomp == TMC_EQUAL && currentlap != inputlap))
)
return false;
@ -1690,14 +1711,10 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
return false;
}
break;
case 323: // nightserize - each time
case 324: // nightserize - once
case 325: // denightserize - each time
case 326: // denightserize - once
case 327: // nights lap - each time
case 328: // nights lap - once
case 329: // nights egg capsule touch - each time
case 330: // nights egg capsule touch - once
case 323: // nightserize
case 325: // denightserize
case 327: // nights lap
case 329: // nights egg capsule touch
if (!P_CheckNightsTriggerLine(triggerline, actor))
return false;
break;
@ -1846,10 +1863,10 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|| specialtype == 318 // Unlockable trigger - Once
|| specialtype == 320 // Unlockable - Once
|| specialtype == 321 || specialtype == 322 // Trigger on X calls - Continuous + Each Time
|| specialtype == 324 // Nightserize - Once
|| specialtype == 326 // DeNightserize - Once
|| specialtype == 328 // Nights lap - Once
|| specialtype == 330 // Nights Bonus Time - Once
|| (specialtype == 323 && triggerline->args[0]) // Nightserize - Once
|| (specialtype == 325 && triggerline->args[0]) // DeNightserize - Once
|| (specialtype == 327 && triggerline->args[0]) // Nights lap - Once
|| (specialtype == 329 && triggerline->args[0]) // Nights Bonus Time - Once
|| specialtype == 333 // Skin - Once
|| specialtype == 336 // Dye - Once
|| specialtype == 399) // Level Load
@ -6754,13 +6771,9 @@ void P_SpawnSpecials(boolean fromnetsave)
// NiGHTS trigger executors
case 323:
case 324:
case 325:
case 326:
case 327:
case 328:
case 329:
case 330:
break;
// Skin trigger executors

47
src/p_spec.h
View file

@ -105,6 +105,53 @@ typedef enum
TMFL_SPLAT = 1<<1,
} textmapfoflaserflags_t;
typedef enum
{
TMC_EQUAL = 0,
TMC_LTE = 1,
TMC_GTE = 2,
} textmapcomparison_t;
typedef enum
{
TMNP_FASTEST = 0,
TMNP_SLOWEST = 1,
TMNP_TRIGGERER = 2,
} textmapnightsplayer_t;
typedef enum
{
TMN_ALWAYS = 0,
TMN_FROMNONIGHTS = 1,
TMN_FROMNIGHTS = 2,
} textmapnighterizeoptions_t;
typedef enum
{
TMN_BONUSLAPS = 1,
TMN_LEVELCOMPLETION = 1<<2,
} textmapnightserizeflags_t;
typedef enum
{
TMD_ALWAYS = 0,
TMD_NOBODYNIGHTS = 1,
TMD_SOMEBODYNIGHTS = 2,
} textmapdenighterizeoptions_t;
typedef enum
{
TMS_IFENOUGH = 0,
TMS_IFNOTENOUGH = 1,
TMS_ALWAYS = 2,
} textmapspherescheck_t;
typedef enum
{
TMI_BONUSLAPS = 1,
TMI_ENTER = 1<<2,
} textmapideyacaptureflags_t;
typedef enum
{
TMP_FLOOR = 0,