diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index ec318321d75fcb1b100f67c80d93c8750cb06282..0168cf210a0b1e64ccd77f86d5555248ec718b58 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -435,7 +435,7 @@ sectortypes
112 = "Trigger Line Ex. (NiGHTS Mare)";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Rings Parameters";
+ 160 = "Special Stage Time/Spheres Parameters";
176 = "Custom Global Gravity";
512 = "Wind/Current";
1024 = "Conveyor Belt";
@@ -490,7 +490,7 @@ gen_sectortypes
112 = "Trigger Line Ex. (NiGHTS Mare)";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Rings Parameters";
+ 160 = "Special Stage Time/Spheres Parameters";
176 = "Custom Global Gravity";
}
@@ -766,6 +766,7 @@ linedeftypes
{
title = "Parameters";
prefix = "(22)";
+ flags32text = "[5] Render outer sides only";
flags64text = "[6] Trigger linedef executor";
flags128text = "[7] Intangible";
flags256text = "[8] Stopped by pushables";
@@ -788,7 +789,6 @@ linedeftypes
{
title = "Angular Displacement by Front Sector";
prefix = "(32)";
- flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't turn players";
flags512text = "[9] Turn all objects";
}
@@ -1136,7 +1136,6 @@ linedeftypes
{
title = "Goo Water, Translucent, No Sides";
prefix = "(125)";
- flags8text = "[3] Slope skew sides";
flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect";
@@ -1227,6 +1226,18 @@ linedeftypes
3dfloorflags = "19F";
}
+ 153
+ {
+ title = "Dynamically Sinking Platform";
+ prefix = "(153)";
+ flags8text = "[3] Slope skew sides";
+ flags32text = "[5] Only block player";
+ flags64text = "[6] Spindash to move";
+ flags128text = "[7] Only block non-players";
+ 3dfloor = true;
+ 3dfloorflags = "19F";
+ }
+
160
{
title = "Floating, Bobbing";
@@ -1282,7 +1293,6 @@ linedeftypes
title = "Rising Platform, Solid, Invisible";
prefix = "(193)";
flags2text = "[1] Sink when stepped on";
- flags8text = "[3] Slope skew sides";
flags32text = "[5] Only block player";
flags64text = "[6] Spindash to move";
flags128text = "[7] Only block non-players";
@@ -1488,16 +1498,22 @@ linedeftypes
{
title = "Mario Block";
prefix = "(250)";
+ flags8text = "[3] Slope skew sides";
flags32text = "[5] Invisible block";
flags64text = "[6] Brick block";
3dfloor = true;
3dfloorflags = "40019F";
+ flags323dfloorflagsremove = "19E";
+ flags643dfloorflagsadd = "200000";
}
251
{
title = "Thwomp Block";
prefix = "(251)";
+ flags8text = "[3] Slope skew sides";
+ flags32text = "[5] Only block player";
+ flags128text = "[7] Only block non-players";
flags512text = "[9] Custom crushing sound";
flags1024text = "[10] Custom speed";
3dfloor = true;
@@ -1513,8 +1529,8 @@ linedeftypes
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
3dfloor = true;
- 3dfloorflags = "8800019";
- flags643dfloorflagsadd = "200006";
+ 3dfloorflags = "880001D";
+ flags643dfloorflagsadd = "200002";
}
253
@@ -1525,7 +1541,7 @@ linedeftypes
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
3dfloor = true;
- 3dfloorflags = "8801019";
+ 3dfloorflags = "880101D";
}
254
@@ -1533,6 +1549,7 @@ linedeftypes
title = "Bustable Block";
prefix = "(254)";
flags8text = "[3] Slope skew sides";
+ flags32text = "[5] Only block player";
flags64text = "[6] Strong characters only";
flags128text = "[7] Only block non-players";
flags512text = "[9] Shattered by pushables";
@@ -1593,6 +1610,7 @@ linedeftypes
{
title = "Custom FOF";
prefix = "(259)";
+ flags8text = "[3] Slope skew sides";
flags32text = "[5] Only block player";
flags128text = "[7] Only block non-players";
flags512text = "[9] Shattered by pushables";
@@ -2161,6 +2179,14 @@ linedeftypes
flags8text = "[3] Set delay by backside sector";
}
+ 449
+ {
+ title = "Enable Bosses with Parameter";
+ prefix = "(449)";
+ flags8text = "[3] Set delay by backside sector";
+ flags64text = "[6] Disable bosses";
+ }
+
457
{
title = "Track Object's Angle";
@@ -2180,12 +2206,14 @@ linedeftypes
{
title = "Award Rings";
prefix = "(460)";
+ flags8text = "[3] Set delay by backside sector";
}
461
{
title = "Spawn Object";
prefix = "(461)";
+ flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Spawn inside a range";
}
@@ -2193,6 +2221,7 @@ linedeftypes
{
title = "Stop Timer/Exit Stage in Record Attack";
prefix = "(462)";
+ flags8text = "[3] Set delay by backside sector";
}
}
@@ -2206,7 +2235,7 @@ linedeftypes
prefix = "(413)";
flags2text = "[1] Keep after death";
flags8text = "[3] Set delay by backside sector";
- flags32text = "[5] Seek to current song position";
+ flags32text = "[5] Seek from current position";
flags64text = "[6] For everyone";
flags128text = "[7] Fade to custom volume";
flags512text = "[9] Don't loop";
@@ -2220,7 +2249,7 @@ linedeftypes
flags2text = "[1] From calling sector";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] From nowhere for triggerer";
- flags512text = "[9] For everyone";
+ flags512text = "[9] From nowhere for everyone";
flags1024text = "[10] From tagged sectors";
}
@@ -2298,7 +2327,6 @@ linedeftypes
flags8text = "[3] Set delay by backside sector";
}
-
445
{
title = "Make FOF Disappear/Reappear";
@@ -2325,8 +2353,8 @@ linedeftypes
flags32text = "[5] Subtract Red value";
flags64text = "[6] Subtract Green value";
flags128text = "[7] Subtract Blue value";
- flags256text = "[8] Calc relative values";
- flags32768text = "[15] Use back side colormap";
+ flags256text = "[8] Set relative to current";
+ flags32768text = "[15] Use backside colormap";
}
448
@@ -2359,7 +2387,7 @@ linedeftypes
prefix = "(452)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Do not handle FF_TRANS";
- flags256text = "[8] Set relative to current val";
+ flags256text = "[8] Set relative to current";
}
453
@@ -2371,7 +2399,7 @@ linedeftypes
flags32text = "[5] No collision during fade";
flags64text = "[6] Do not handle FF_TRANS";
flags128text = "[7] Do not handle lighting";
- flags256text = "[8] Set relative to current val";
+ flags256text = "[8] Set relative to current";
flags512text = "[9] Speed = Tic Duration";
flags1024text = "[10] Override existing fade";
flags16384text = "[14] Do not handle collision";
@@ -2395,11 +2423,11 @@ linedeftypes
flags32text = "[5] Subtract Red value";
flags64text = "[6] Subtract Green value";
flags128text = "[7] Subtract Blue value";
- flags256text = "[8] Calc relative values";
+ flags256text = "[8] Set relative to current";
flags512text = "[9] Speed = Tic Duration";
flags1024text = "[10] Override existing fade";
flags16384text = "[14] Fade from invisible black";
- flags32768text = "[15] Use back side colormap";
+ flags32768text = "[15] Use backside colormap";
}
456
@@ -2416,9 +2444,7 @@ linedeftypes
flags2text = "[1] Close text prompt";
flags8text = "[3] Set delay by backside sector";
flags32text = "[5] Run executor tag on close";
- flags64text = "[6] For everyone";
- flags128text = "[7] Do not block controls";
- flags256text = "[8] Do not freeze time";
+ flags128text = "[7] Don't disable controls";
flags32768text = "[15] Find prompt by name";
}
}
@@ -2524,7 +2550,7 @@ linedeftypes
prefix = "(491)";
flags8text = "[3] Set delay by backside sector";
flags16text = "[4] Set raw alpha by Front X";
- flags256text = "[8] Calc relative values";
+ flags256text = "[8] Set relative to current";
}
492
@@ -2534,7 +2560,7 @@ linedeftypes
flags8text = "[3] Set delay by backside sector";
flags16text = "[4] Set raw alpha by Front X";
flags32text = "[5] No collision during fade";
- flags256text = "[8] Calc relative values";
+ flags256text = "[8] Set relative to current";
flags512text = "[9] Speed = Tic Duration";
flags1024text = "[10] Override existing fade";
flags16384text = "[14] Do not handle collision";
@@ -2632,76 +2658,84 @@ linedeftypes
{
title = "Carry Objects on Floor";
prefix = "(520)";
+ flags64text = "[6] Exclusive";
}
521
{
title = "Carry Objects on Floor (Accelerative)";
prefix = "(521)";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
522
{
title = "Carry Objects on Floor (Displacement)";
prefix = "(522)";
+ flags64text = "[6] Exclusive";
}
523
{
title = "Carry Objects on Ceiling";
prefix = "(523)";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
524
{
title = "Carry Objects on Ceiling (Accelerative)";
prefix = "(524)";
+ flags64text = "[6] Exclusive";
}
525
{
title = "Carry Objects on Ceiling (Displacement)";
prefix = "(525)";
+ flags64text = "[6] Exclusive";
}
530
{
title = "Scroll Floor Texture and Carry Objects";
prefix = "(530)";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
531
{
title = "Scroll Floor Texture and Carry Objects (Accelerative)";
prefix = "(531)";
+ flags64text = "[6] Exclusive";
}
532
{
title = "Scroll Floor Texture and Carry Objects (Displacement)";
prefix = "(532)";
+ flags64text = "[6] Exclusive";
}
533
{
title = "Scroll Ceiling Texture and Carry Objects";
prefix = "(533)";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
534
{
title = "Scroll Ceiling Texture and Carry Objects (Accelerative)";
prefix = "(534)";
+ flags64text = "[6] Exclusive";
}
535
{
title = "Scroll Ceiling Texture and Carry Objects (Displacement)";
prefix = "(535)";
+ flags64text = "[6] Exclusive";
}
}
@@ -2714,7 +2748,7 @@ linedeftypes
title = "Wind";
prefix = "(541)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
542
@@ -2722,7 +2756,7 @@ linedeftypes
title = "Upwards Wind";
prefix = "(542)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
543
@@ -2730,7 +2764,7 @@ linedeftypes
title = "Downwards Wind";
prefix = "(543)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
544
@@ -2738,7 +2772,7 @@ linedeftypes
title = "Current";
prefix = "(544)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
545
@@ -2746,7 +2780,7 @@ linedeftypes
title = "Upwards Current";
prefix = "(545)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
546
@@ -2754,13 +2788,14 @@ linedeftypes
title = "Downwards Current";
prefix = "(546)";
flags512text = "[9] Player slides";
- flags64text = "[6] Even across edges";
+ flags64text = "[6] Exclusive";
}
547
{
title = "Push/Pull";
prefix = "(547)";
+ flags64text = "[6] Exclusive";
}
}
@@ -3897,9 +3932,10 @@ thingtypes
title = "Monitors";
width = 18;
height = 40;
- flags1text = "[1] Run Linedef Executor on pop";
+ flags1text = "[1] Run linedef executor on pop";
flags4text = "[4] Random (Strong)";
flags8text = "[8] Random (Weak)";
+ angletext = "Tag";
400
{
@@ -4029,7 +4065,8 @@ thingtypes
title = "Monitors (Respawning)";
width = 20;
height = 44;
- flags1text = "[1] Run Linedef Executor on pop";
+ flags1text = "[1] Run linedef executor on pop";
+ angletext = "Tag";
431
{
@@ -4125,7 +4162,9 @@ thingtypes
sprite = "STPTA0M0";
width = 64;
height = 128;
+ flags4text = "[4] Respawn at center";
angletext = "Angle/Order";
+ parametertext = "Order";
}
520
{
@@ -4558,6 +4597,7 @@ thingtypes
sprite = "TOADA0";
width = 32;
height = 16;
+ angletext = "Tag";
}
757
{
@@ -5832,7 +5872,7 @@ thingtypes
sprite = "CAPSA0";
width = 72;
height = 144;
- angletext = "Rings";
+ angletext = "Spheres";
parametertext = "Mare";
}
}