diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index ae905b637b334286c58eb339f18b735838c5929d..b5078cd0cbdcca82345b86eb45730a42f8950d9c 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -41,6 +41,9 @@ linetagindicatesectors = true;
// The format interface handles the map data format - DoomMapSetIO for SRB2DB2, SRB2MapSetIO for Zone Builder
formatinterface = "SRB2MapSetIO";
+
+//Maximum safe map size check (0 means skip check)
+safeboundary = 0;
//Sky textures for vanilla maps
defaultskytextures
@@ -77,7 +80,7 @@ defaultskytextures
defaultlumpname = "MAP01";
// Default testing parameters
-testparameters = "-file \"%AP\" \"%F\" -warp %L";
+testparameters = "-folder \"%AF\" -file \"%AA\" \"%F\" -warp %L";
testshortpaths = true;
// Default nodebuilder configurations
@@ -437,6 +440,8 @@ sectortypes
144 = "Egg Capsule";
160 = "Special Stage Time/Spheres Parameters <deprecated>";
176 = "Custom Global Gravity <deprecated>";
+ 512 = "Wind/Current <deprecated>";
+ 1024 = "Conveyor Belt <deprecated>";
1280 = "Speed Pad";
1536 = "Flip Gravity on Jump";
4096 = "Star Post Activator";
@@ -496,6 +501,8 @@ gen_sectortypes
third
{
0 = "Normal";
+ 512 = "Wind/Current <deprecated>";
+ 1024 = "Conveyor Belt <deprecated>";
1280 = "Speed Pad";
1536 = "Flip Gravity on Jump";
}
@@ -578,7 +585,7 @@ linedeftypes
title = "Per-Sector Gravity";
prefix = "(1)";
flags64text = "[6] Flip in reverse gravity";
- flags8192text = "[13] Reverse while inside";
+ flags8192text = "[13] Cancel MF2_OBJECTFLIP";
}
5
@@ -641,35 +648,35 @@ linedeftypes
96
{
- title = "Apply Tag to Tagged Sectors";
+ title = "Add Front Sector Tag to Tagged Sectors";
prefix = "(96)";
flags1024text = "[10] Offsets are target tags";
- flags8192text = "[13] Use front side offsets";
- flags32768text = "[15] Use back side offsets";
+ flags8192text = "[13] Add front side offsets";
+ flags32768text = "[15] Add back side offsets";
}
97
{
- title = "Apply Tag to Front Sector";
+ title = "Add Tag to Front Sector";
prefix = "(97)";
- flags8192text = "[13] Use front side offsets";
- flags32768text = "[15] Use back side offsets";
+ flags8192text = "[13] Add front side offsets";
+ flags32768text = "[15] Add back side offsets";
}
98
{
- title = "Apply Tag to Back Sector";
+ title = "Add Tag to Back Sector";
prefix = "(98)";
- flags8192text = "[13] Use front side offsets";
- flags32768text = "[15] Use back side offsets";
+ flags8192text = "[13] Add front side offsets";
+ flags32768text = "[15] Add back side offsets";
}
99
{
- title = "Apply Tag to Front and Back Sectors";
+ title = "Add Tag to Front and Back Sectors";
prefix = "(99)";
- flags8192text = "[13] Use front side offsets";
- flags32768text = "[15] Use back side offsets";
+ flags8192text = "[13] Add front side offsets";
+ flags32768text = "[15] Add back side offsets";
}
540
@@ -990,6 +997,7 @@ linedeftypes
flags128text = "[7] Only block non-players";
3dfloor = true;
3dfloorflags = "47";
+ invisiblefof = true;
}
140
@@ -1227,6 +1235,7 @@ linedeftypes
prefix = "(223)";
3dfloor = true;
3dfloorflags = "41";
+ invisiblefof = true;
}
}
@@ -1524,6 +1533,7 @@ linedeftypes
prefix = "(200)";
3dfloor = true;
3dfloorflags = "20201";
+ invisiblefof = true;
}
201
@@ -1532,6 +1542,7 @@ linedeftypes
prefix = "(201)";
3dfloor = true;
3dfloorflags = "201";
+ invisiblefof = true;
}
202
@@ -1539,7 +1550,8 @@ linedeftypes
title = "Fog Block";
prefix = "(202)";
3dfloor = true;
- 3dfloorflags = "3EF19";
+ 3dfloorflags = "3EF01";
+ invisiblefof = true;
}
250
@@ -3624,7 +3636,7 @@ thingtypes
3328 = "3D Mode Start";
}
-
+
starts
{
color = 1; // Blue
@@ -3814,7 +3826,7 @@ thingtypes
enemies
{
- color = 9; // Light_Blue
+ color = 9; // Light Blue
arrow = 1;
title = "Enemies";
@@ -4124,7 +4136,7 @@ thingtypes
bosses
{
- color = 8; // Dark_Gray
+ color = 4; // Dark Red
arrow = 1;
title = "Bosses";
@@ -4223,6 +4235,7 @@ thingtypes
sprite = "internal:capsule";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
}
292
{
@@ -4310,13 +4323,13 @@ thingtypes
308
{
title = "CTF Team Ring (Red)";
- sprite = "internal:TRNGA0r";
+ sprite = "internal:TRNGA0R";
width = 16;
}
309
{
title = "CTF Team Ring (Blue)";
- sprite = "internal:TRNGA0b";
+ sprite = "internal:TRNGA0B";
width = 16;
}
330
@@ -4353,7 +4366,7 @@ thingtypes
collectibles
{
- color = 10; // Light_Green
+ color = 10; // Light Green
title = "Other Collectibles";
width = 16;
height = 32;
@@ -4457,6 +4470,7 @@ thingtypes
flags8text = "[8] Random (Weak)";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
400
{
@@ -4589,6 +4603,7 @@ thingtypes
flags1text = "[1] Run linedef executor on pop";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
431
{
@@ -4659,7 +4674,7 @@ thingtypes
generic
{
- color = 11; // Light_Cyan
+ color = 11; // Light Cyan
title = "Generic Items & Hazards";
500
@@ -4765,7 +4780,7 @@ thingtypes
springs
{
- color = 12; // Light_Red
+ color = 12; // Light Red
title = "Springs and Fans";
width = 20;
height = 16;
@@ -4927,13 +4942,13 @@ thingtypes
{
arrow = 0;
title = "5 Vertical Rings (Yellow Spring)";
- sprite = "RINGA0";
+ sprite = "internal:ringverticalyellow";
}
601
{
arrow = 0;
title = "5 Vertical Rings (Red Spring)";
- sprite = "RINGA0";
+ sprite = "internal:ringverticalred";
height = 1024;
}
602
@@ -4951,7 +4966,7 @@ thingtypes
604
{
title = "Circle of Rings";
- sprite = "RINGA0";
+ sprite = "internal:circlering";
width = 96;
height = 192;
unflippable = true;
@@ -4960,7 +4975,7 @@ thingtypes
605
{
title = "Circle of Rings (Big)";
- sprite = "RINGA0";
+ sprite = "internal:circlebigring";
width = 192;
unflippable = true;
centerHitbox = true;
@@ -4968,7 +4983,7 @@ thingtypes
606
{
title = "Circle of Blue Spheres";
- sprite = "SPHRA0";
+ sprite = "internal:circlesphere";
width = 96;
height = 192;
unflippable = true;
@@ -4977,7 +4992,7 @@ thingtypes
607
{
title = "Circle of Blue Spheres (Big)";
- sprite = "SPHRA0";
+ sprite = "internal:circlebigsphere";
width = 192;
unflippable = true;
centerHitbox = true;
@@ -4985,7 +5000,7 @@ thingtypes
608
{
title = "Circle of Rings and Spheres";
- sprite = "SPHRA0";
+ sprite = "internal:circleringsphere";
width = 96;
height = 192;
unflippable = true;
@@ -4994,86 +5009,84 @@ thingtypes
609
{
title = "Circle of Rings and Spheres (Big)";
- sprite = "SPHRA0";
+ sprite = "internal:circlebigringsphere";
width = 192;
unflippable = true;
centerHitbox = true;
}
}
- invisible
+ ambience
{
- color = 15; // White
- title = "Misc. Invisible";
+ color = 8; // Dark Gray
+ title = "Ambience";
width = 8;
height = 16;
- sprite = "UNKNA0";
+ sprite = "internal:ambiance";
700
{
title = "Water Ambience A (Large)";
- sprite = "internal:ambiance";
}
701
{
title = "Water Ambience B (Large)";
- sprite = "internal:ambiance";
}
702
{
title = "Water Ambience C (Medium)";
- sprite = "internal:ambiance";
}
703
{
title = "Water Ambience D (Medium)";
- sprite = "internal:ambiance";
}
704
{
title = "Water Ambience E (Small)";
- sprite = "internal:ambiance";
}
705
{
title = "Water Ambience F (Small)";
- sprite = "internal:ambiance";
}
706
{
title = "Water Ambience G (Extra Large)";
- sprite = "internal:ambiance";
}
707
{
title = "Water Ambience H (Extra Large)";
- sprite = "internal:ambiance";
}
708
{
title = "Disco Ambience";
- sprite = "internal:ambiance";
}
709
{
title = "Volcano Ambience";
- sprite = "internal:ambiance";
}
710
{
title = "Machine Ambience";
- sprite = "internal:ambiance";
}
+ }
+
+ invisible
+ {
+ color = 15; // White
+ title = "Misc. Invisible";
+ width = 8;
+ height = 16;
+ sprite = "UNKNA0";
750
{
@@ -5083,6 +5096,7 @@ thingtypes
fixedrotation = 1;
parametertext = "Absolute?";
flagsvaluetext = "Absolute Z";
+ tagthing = true;
}
751
@@ -5128,20 +5142,22 @@ thingtypes
756
{
title = "Blast Linedef Executor";
- sprite = "TOADA0";
+ sprite = "internal:blastexec";
width = 32;
height = 16;
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
}
757
{
title = "Fan Particle Generator";
- sprite = "PRTLA0";
+ sprite = "internal:fanparticles";
width = 8;
height = 16;
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
}
758
{
@@ -5154,6 +5170,8 @@ thingtypes
sprite = "internal:polyanchor";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
+ unflippable = true;
}
761
@@ -5162,6 +5180,8 @@ thingtypes
sprite = "internal:polycenter";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
+ unflippable = true;
}
762
@@ -5170,6 +5190,8 @@ thingtypes
sprite = "internal:polycentercrush";
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
+ unflippable = true;
}
780
{
@@ -5183,7 +5205,7 @@ thingtypes
greenflower
{
- color = 10; // Green
+ color = 2; // Green
title = "Greenflower";
800
@@ -5288,7 +5310,7 @@ thingtypes
technohill
{
- color = 10; // Green
+ color = 2; // Green
title = "Techno Hill";
900
@@ -5332,7 +5354,7 @@ thingtypes
deepsea
{
- color = 10; // Green
+ color = 2; // Green
title = "Deep Sea";
1000
@@ -5467,7 +5489,7 @@ thingtypes
castleeggman
{
- color = 10; // Green
+ color = 2; // Green
title = "Castle Eggman";
1100
@@ -5516,6 +5538,7 @@ thingtypes
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1105
{
@@ -5528,6 +5551,7 @@ thingtypes
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1106
{
@@ -5540,23 +5564,25 @@ thingtypes
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1107
{
title = "Chain Spawnpoint";
- sprite = "BMCHA0";
+ sprite = "BMCHB0";
width = 17;
height = 34;
flags8text = "[8] Double size";
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1108
{
arrow = 1;
title = "Hidden Chain Spawnpoint";
- sprite = "internal:chain3";
+ sprite = "SMCHA0";
width = 17;
height = 34;
flags8text = "[8] Double size";
@@ -5572,6 +5598,7 @@ thingtypes
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1110
{
@@ -5583,6 +5610,7 @@ thingtypes
angletext = "Tag";
parametertext = "Spokes";
fixedrotation = 1;
+ tagthing = true;
}
1111
{
@@ -5736,7 +5764,7 @@ thingtypes
aridcanyon
{
- color = 10; // Green
+ color = 2; // Green
title = "Arid Canyon";
1200
@@ -5764,6 +5792,7 @@ thingtypes
height = 16;
angletext = "Tag";
fixedrotation = 1;
+ tagthing = true;
}
1203
{
@@ -5955,7 +5984,7 @@ thingtypes
redvolcano
{
- color = 10; // Green
+ color = 2; // Green
title = "Red Volcano";
1300
@@ -6055,7 +6084,7 @@ thingtypes
botanicserenity
{
- color = 10; // Green
+ color = 2; // Green
title = "Botanic Serenity";
width = 16;
height = 32;
@@ -6298,7 +6327,7 @@ thingtypes
azuretemple
{
- color = 10; // Green
+ color = 2; // Green
title = "Azure Temple";
1500
@@ -6374,7 +6403,7 @@ thingtypes
dreamhill
{
- color = 10; // Green
+ color = 2; // Green
title = "Dream Hill";
1600
@@ -6402,8 +6431,8 @@ thingtypes
nightstrk
{
- color = 13; // Pink
- title = "NiGHTS Track";
+ color = 16; // Light Pink
+ title = "NiGHTS Track & Basics";
width = 8;
height = 4096;
sprite = "UNKNA0";
@@ -6438,6 +6467,19 @@ thingtypes
flagsvaluetext = "Order";
parametertext = "Mare";
}
+ 1703
+ {
+ title = "Ideya Drone";
+ sprite = "NDRNA1";
+ width = 16;
+ height = 56;
+ flags1text = "[1] Align player to middle";
+ flags4text = "[4] Align player to top";
+ flags8text = "[8] Die upon time up";
+ angletext = "Time limit";
+ fixedrotation = 1;
+ parametertext = "Height";
+ }
1710
{
title = "Ideya Capture";
@@ -6455,20 +6497,6 @@ thingtypes
title = "NiGHTS Items";
width = 16;
height = 32;
-
- 1703
- {
- title = "Ideya Drone";
- sprite = "NDRNA1";
- width = 16;
- height = 56;
- flags1text = "[1] Align player to middle";
- flags4text = "[4] Align player to top";
- flags8text = "[8] Die upon time up";
- angletext = "Time limit";
- fixedrotation = 1;
- parametertext = "Height";
- }
1704
{
arrow = 1;
@@ -6479,13 +6507,12 @@ thingtypes
unflippable = true;
flagsvaluetext = "Pitch";
angletext = "Yaw";
- fixedrotation = 1;
}
1705
{
arrow = 1;
title = "Hoop (Generic)";
- sprite = "HOOPA0";
+ sprite = "internal:nightshoop";
width = 80;
height = 160;
unflippable = true;
@@ -6502,7 +6529,6 @@ thingtypes
height = 24;
flags8height = 24;
flags8text = "[8] Float";
- unflippable = true;
}
1707
{
@@ -6547,7 +6573,7 @@ thingtypes
flags2text = "[2] Radius +32";
flags4text = "[4] Radius +64";
flags8text = "[8] Radius +128";
- sprite = "HOOPA0";
+ sprite = "internal:nightshoop";
width = 80;
height = 160;
unflippable = true;
@@ -6657,7 +6683,7 @@ thingtypes
christmasdisco
{
- color = 10; // Green
+ color = 2; // Green
title = "Christmas & Disco";
1850
@@ -6760,7 +6786,7 @@ thingtypes
stalagmites
{
- color = 10; // Green
+ color = 2; // Green
title = "Stalagmites";
width = 16;
height = 40;
@@ -6839,7 +6865,7 @@ thingtypes
hauntedheights
{
- color = 10; // Green
+ color = 2; // Green
title = "Haunted Heights";
2000
@@ -6928,7 +6954,7 @@ thingtypes
frozenhillside
{
- color = 10; // Green
+ color = 2; // Green
title = "Frozen Hillside";
2100
@@ -6979,7 +7005,7 @@ thingtypes
tutorial
{
- color = 10; // Green
+ color = 2; // Green
title = "Tutorial";
799
@@ -6990,10 +7016,11 @@ thingtypes
height = 144;
parametertext = "Start frame";
}
+ }
flickies
{
- color = 10; // Green
+ color = 3; // Teal
title = "Flickies";
width = 8;
height = 20;