Add newer UDMF config

extras/conf/udb/Includes/Game_Kart2.cfg

@@ -1,77 +0,0 @@
-// Default lump name for new map
-defaultlumpname = "MAP01";
-//GZDB specific. Don't try to load lumps that don't exist.
-basegame = "Doom";
-
-//Sky textures for vanilla maps
-defaultskytextures
-{
-	SKY1 = "MAP01,MAP02,MAP03,MAP33,MAP50,MAP60,MAPF0,MAPM0";
-	SKY2 = "MAPM7,MAPMB";
-	SKY4 = "MAP04,MAP06,MAP61,MAPF6,MAPM1";
-	SKY6 = "MAP05,MAP51,MAPMA";
-	SKY7 = "MAPM2,MAPM5";
-	SKY8 = "MAP07,MAP08,MAP09,MAP52,MAP62,MAPF1";
-	SKY10 = "MAP10,MAP12,MAP53,MAP63,MAPM3";
-	SKY11 = "MAP11,MAPF7";
-	SKY13 = "MAP13,MAP64";
-	SKY14 = "MAP14";
-	SKY15 = "MAP15,MAP54";
-	SKY17 = "MAP70";
-	SKY20 = "MAP32,MAP55,MAP65,MAPF2,MAPF5";
-	SKY21 = "MAPM4";
-	SKY22 = "MAP22,MAP23,MAP25,MAP26,MAP27,MAP56,MAP66,MAPF4,MAPM6";
-	SKY30 = "MAP30";
-	SKY31 = "MAP31";
-	SKY35 = "MAP42";
-	SKY40 = "MAP41,MAP71,MAPM9";
-	SKY55 = "MAPF3,MAPM8";
-	SKY68 = "MAPF8";
-	SKY99 = "MAP57,MAPZ0";
-	SKY159 = "MAP16";
-	SKY172 = "MAP40";
-	SKY300 = "MAP72";
-	SKY301 = "MAP73";
-}
-
-// Skill levels
-skills
-{
-	0 = "Easy";
-	1 = "Normal";
-	2 = "Hard";
-	3 = "Master";
-}
-
-// Skins
-skins
-{
-	sonic;
-	tails;
-	knuckles;
-	amy;
-	mighty;
-	fang;
-	eggman;
-	metalsonic;
-	motobug;
-}
-
-// Gametypes
-gametypes
-{
-	-1 = "Single Player";
-	0 = "Race";
-	1 = "Battle";
-}
-
-// Texture loading options
-defaultwalltexture = "GFZROCK";
-defaultfloortexture = "GFZFLR01";
-defaultceilingtexture = "F_SKY1";
-
-// Default texture sets
-// (these are not required, but useful for new users)
-texturesets
-{
-}

extras/conf/udb/Includes/Game_RingRacers.cfg

@@ -0,0 +1,53 @@
+// Default lump name for new map
+defaultlumpname = "MAPNAME";
+
+//GZDB specific. Don't try to load lumps that don't exist.
+basegame = "Doom";
+
+//Sky textures for vanilla maps
+defaultskytextures
+{
+	SKY1 = "MAP01";
+}
+
+// Skill levels
+skills
+{
+	0 = "Easy";
+	1 = "Normal";
+	2 = "Hard";
+	3 = "Master";
+}
+
+// Skins
+skins
+{
+	sonic;
+	tails;
+	knuckles;
+	amy;
+	mighty;
+	fang;
+	eggman;
+	metalsonic;
+	motobug;
+}
+
+// Gametypes
+gametypes
+{
+	-1 = "Grand Prix";
+	0 = "Race";
+	1 = "Battle";
+}
+
+// Texture loading options
+defaultwalltexture = "DEV_OC3";
+defaultfloortexture = "DEV_GZ2";
+defaultceilingtexture = "F_SKY1";
+
+// Default texture sets
+// (these are not required, but useful for new users)
+texturesets
+{
+}

extras/conf/udb/Includes/Kart2_sectors.cfg

@@ -1,105 +0,0 @@
-sectortypes
-{
-	0 = "Normal";
-	1 = "Damage";
-	2 = "Damage (Water)";
-	3 = "Damage (Fire)";
-	4 = "Damage (Electrical)";
-	5 = "Spikes";
-	6 = "Death Pit (Camera Tilt)";
-	7 = "Death Pit (No Camera Tilt)";
-	8 = "Instant Kill";
-	9 = "Ring Drainer (Floor Touch)";
-	10 = "Ring Drainer (Anywhere in Sector)";
-	11 = "Special Stage Damage";
-	12 = "Space Countdown";
-	13 = "Ramp Sector (double step-up/down)";
-	14 = "Non-Ramp Sector (no step-down)";
-	15 = "Bouncy FOF <deprecated>";
-	16 = "Trigger Line Ex. (Pushable Objects)";
-	32 = "Trigger Line Ex. (Anywhere, All Players)";
-	48 = "Trigger Line Ex. (Floor Touch, All Players)";
-	64 = "Trigger Line Ex. (Anywhere in Sector)";
-	80 = "Trigger Line Ex. (Floor Touch)";
-	96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
-	112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
-	128 = "Check for Linedef Executor on FOFs";
-	144 = "Egg Capsule";
-	160 = "Special Stage Time/Spheres Parameters <deprecated>";
-	176 = "Custom Global Gravity <deprecated>";
-	1280 = "Speed Pad";
-	4096 = "Star Post Activator";
-	8192 = "Exit/Special Stage Pit/Return Flag";
-	12288 = "CTF Red Team Base";
-	16384 = "CTF Blue Team Base";
-	20480 = "Fan Sector";
-	24576 = "Super Sonic Transform";
-	28672 = "Force Spin";
-	32768 = "Zoom Tube Start";
-	36864 = "Zoom Tube End";
-	40960 = "Circuit Finish Line";
-	45056 = "Rope Hang";
-	49152 = "Intangible to the Camera";
-}
-
-gen_sectortypes
-{
-	first
-	{
-		0 = "Normal";
-		1 = "Damage";
-		2 = "Damage (Water)";
-		3 = "Damage (Fire)";
-		4 = "Damage (Electrical)";
-		5 = "Spikes";
-		6 = "Death Pit (Camera Tilt)";
-		7 = "Death Pit (No Camera Tilt)";
-		8 = "Instant Kill";
-		9 = "Ring Drainer (Floor Touch)";
-		10 = "Ring Drainer (Anywhere in Sector)";
-		11 = "Special Stage Damage";
-		12 = "Space Countdown";
-		13 = "Ramp Sector (double step-up/down)";
-		14 = "Non-Ramp Sector (no step-down)";
-		15 = "Bouncy FOF <deprecated>";
-	}
-
-	second
-	{
-		0 = "Normal";
-		16 = "Trigger Line Ex. (Pushable Objects)";
-		32 = "Trigger Line Ex. (Anywhere, All Players)";
-		48 = "Trigger Line Ex. (Floor Touch, All Players)";
-		64 = "Trigger Line Ex. (Anywhere in Sector)";
-		80 = "Trigger Line Ex. (Floor Touch)";
-		96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
-		112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
-		128 = "Check for Linedef Executor on FOFs";
-		144 = "Egg Capsule";
-		160 = "Special Stage Time/Spheres Parameters <deprecated>";
-		176 = "Custom Global Gravity <deprecated>";
-	}
-
-	third
-	{
-		0 = "Normal";
-		1280 = "Speed Pad";
-	}
-
-	fourth
-	{
-		0 = "Normal";
-		4096 = "Star Post Activator";
-		8192 = "Exit/Special Stage Pit/Return Flag";
-		12288 = "CTF Red Team Base";
-		16384 = "CTF Blue Team Base";
-		20480 = "Fan Sector";
-		24576 = "Super Sonic Transform";
-		28672 = "Force Spin";
-		32768 = "Zoom Tube Start";
-		36864 = "Zoom Tube End";
-		40960 = "Circuit Finish Line";
-		45056 = "Rope Hang";
-		49152 = "Intangible to the Camera";
-	}
-}

extras/conf/udb/Includes/RingRacers_common.cfg

@@ -6,7 +6,7 @@ common
 	// Enables support for long (> 8 chars) texture names
 	// WARNING: this should only be enabled for UDMF game configurations!
 	// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
-	longtexturenames = true;
+	longtexturenames = false;
 
 	// These directory names are ignored when loading PK3/PK7/Directory resources
 	ignoreddirectories = ".svn .git";
@@ -16,7 +16,7 @@ common
 
 	// Default testing parameters
 	testparameters = "-file \"%AP\" \"%F\" -warp %L";
-	testshortpaths = true;
+	testshortpaths = false;
 
 	// Action special help
 	actionspecialhelp = "https://wiki.srb2.org/wiki/Linedef_type_%K";
@@ -46,26 +46,28 @@ common
 	// Texture sources
 	textures
 	{
-		include("Kart2_misc.cfg", "textures");
+		include("RingRacers_misc.cfg", "textures");
 	}
 
 	// Patch sources
 	patches
 	{
-		include("Kart2_misc.cfg", "patches");
+		include("RingRacers_misc.cfg", "patches");
 	}
 
 	// Sprite sources
 	sprites
 	{
-		include("Kart2_misc.cfg", "sprites");
+		include("RingRacers_misc.cfg", "sprites");
 	}
 
 	// Flat sources
+	/*
 	flats
 	{
-		include("Kart2_misc.cfg", "flats");
+		include("RingRacers_misc.cfg", "flats");
 	}
+	*/
 }
 
 mapformat_udmf
@@ -78,25 +80,26 @@ mapformat_udmf
 	defaulttestcompiler = "zdbsp_udmf_fast";
 
 	// Determines the textmap namespace
-	engine = "srb2kart";
+	engine = "ringracers";
 
 	maplumpnames
 	{
 		include("UDMF_misc.cfg", "udmfmaplumpnames_begin");
-		include("Kart2_misc.cfg", "udmfmaplumpnames");
+		include("RingRacers_misc.cfg", "udmfmaplumpnames");
+		include("RingRacers_misc.cfg", "sharedmaplumpnames");
 		include("UDMF_misc.cfg", "udmfmaplumpnames_end");
 	}
 
 	universalfields
 	{
-		include("Kart2_misc.cfg", "universalfields");
+		include("RingRacers_misc.cfg", "universalfields");
 	}
 
 	// When this is set to true, sectors with the same tag will light up when a line is highlighted
 	linetagindicatesectors = false;
 
 	// Special linedefs
-	include("Kart2_misc.cfg", "speciallinedefs_udmf");
+	include("RingRacers_misc.cfg", "speciallinedefs_udmf");
 
 	// Default flags for first new thing
 	defaultthingflags
@@ -106,50 +109,38 @@ mapformat_udmf
 	// SECTOR FLAGS
 	sectorflags
 	{
-		include("Kart2_misc.cfg", "sectorflags");
+		include("RingRacers_misc.cfg", "sectorflags");
 	}
 
 	// DEFAULT SECTOR BRIGHTNESS LEVELS
 	sectorbrightness
 	{
-		include("Kart2_misc.cfg", "sectorbrightness");
+		include("RingRacers_misc.cfg", "sectorbrightness");
 	}
 
-	damagetypes = "Generic Water Fire Lava Electric Spike DeathPitTilt DeathPitNoTilt Instakill SpecialStage";
+	damagetypes = "Generic Lava DeathPit Instakill";
-
-	// SECTOR TYPES
-	sectortypes
-	{
-		include("Kart2_sectors.cfg", "sectortypes");
-	}
-
-	// GENERALISED SECTOR TYPES
-	gen_sectortypes
-	{
-		include("Kart2_sectors.cfg", "gen_sectortypes");
-	}
 
 	// LINEDEF FLAGS
 	linedefflags
 	{
-		include("Kart2_misc.cfg", "linedefflags_udmf");
+		include("RingRacers_misc.cfg", "linedefflags_udmf");
 	}
 
 	linedefflagstranslation
 	{
-		include("Kart2_misc.cfg", "linedefflagstranslation");
+		include("RingRacers_misc.cfg", "linedefflagstranslation");
 	}
 
 	// LINEDEF RENDERSTYLES
 	linedefrenderstyles
 	{
-		include("Kart2_misc.cfg", "linedefrenderstyles");
+		include("RingRacers_misc.cfg", "linedefrenderstyles");
 	}
 
 	// THING FLAGS
 	thingflags
 	{
-		include("Kart2_misc.cfg", "thingflags_udmf");
+		include("RingRacers_misc.cfg", "thingflags_udmf");
 	}
 
 	// Thing flags UDMF translation table
@@ -157,7 +148,7 @@ mapformat_udmf
 	// When the UDMF field name is prefixed with ! it is inverted
 	thingflagstranslation
 	{
-		include("Kart2_misc.cfg", "thingflagstranslation");
+		include("RingRacers_misc.cfg", "thingflagstranslation");
 	}
 
 	// How to compare thing flags (for the stuck things error checker)
@@ -169,12 +160,12 @@ mapformat_udmf
 	// THING TYPES
 	thingtypes
 	{
-		include("Kart2_things.cfg", "udmf");
+		include("RingRacers_things.cfg", "udmf");
 	}
 
 	// LINEDEF TYPES
 	linedeftypes
 	{
-		include("Kart2_linedefs.cfg", "udmf");
+		include("RingRacers_linedefs.cfg", "udmf");
 	}
 }

extras/conf/udb/Includes/RingRacers_misc.cfg

@@ -1,21 +1,21 @@
 linedefflags
 {
 	1 = "[0] Impassable";
-	2 = "[1] Block Enemies";
+	2 = "[1] Block Players";
 	4 = "[2] Double-Sided";
 	8 = "[3] Upper Unpegged";
 	16 = "[4] Lower Unpegged";
-	32 = "[5] Slope Skew (E1)";
+	32 = "[5] Slope Skew";
 	64 = "[6] Not Climbable";
-	128 = "[7] No Midtexture Skew (E2)";
+	128 = "[7] No Midtexture Skew";
-	256 = "[8] Peg Midtexture (E3)";
+	256 = "[8] Peg Midtexture";
-	512 = "[9] Solid Midtexture (E4)";
+	512 = "[9] Solid Midtexture";
-	1024 = "[10] Repeat Midtexture (E5)";
+	1024 = "[10] Repeat Midtexture";
 	2048 = "[11] Netgame Only";
 	4096 = "[12] No Netgame";
-	8192 = "[13] Effect 6";
+	8192 = "[13] Block Enemies";
-	16384 = "[14] Bouncy Wall";
+	16384 = "[14] Don't Bump";
-	32768 = "[15] Transfer Line";
+	32768 = "[15] FOF Transfer";
 }
 
 
@@ -59,14 +59,8 @@ linedefflags_udmf
 	netonly = "Netgame Only";
 	nonet = "No Netgame";
 	blockmonsters = "Block Enemies";
-	bouncy = "Not Bouncy";
+	bouncy = "Don't Bump";
-	transfer = "Transfer Line";
+	transfer = "FOF Transfer";
-}
-
-linedefactivations_udmf
-{
-	netonly = "Netgame Only";
-	nonet = "No Netgame";
 }
 
 linedefrenderstyles
@@ -94,26 +88,19 @@ sectorflags
 	gravityflip = "Flip Objects in Reverse Gravity";
 	heatwave = "Heat Wave";
 	noclipcamera = "Intangible to the Camera";
-	ripple_floor = "Ripply Floor";
+	ripple_floor = "Water Ripple Floor";
-	ripple_ceiling = "Ripply Ceiling";
+	ripple_ceiling = "Water Ripple Ceiling";
-	invertencore = "Invert Encore Remap";
+	invertencore = "Encore Remap Invert";
-	outerspace = "Space Countdown";
+	nostepup = "Wall Sector (no step-up)";
 	doublestepup = "Ramp Sector (double step-up/down)";
-	nostepdown = "Non-Ramp Sector (No step-down)";
+	nostepdown = "Non-Ramp Sector (no step-down)";
 	speedpad = "Speed Pad";
 	starpostactivator = "Star Post Activator";
 	exit = "Exit";
-	specialstagepit = "Special Stage Pit";
-	returnflag = "Return Flag";
-	redteambase = "Red Team Base";
-	blueteambase = "Blue Team Base";
 	fan = "Fan Sector";
-	supertransform = "Super Sonic Transform";
+	deleteitems = "Delete Items";
-	forcespin = "Force Spin";
 	zoomtubestart = "Zoom Tube Start";
 	zoomtubeend = "Zoom Tube End";
-	finishline = "Circuit Finish Line";
-	ropehang = "Rope Hang";
 }
 
 thingflags
@@ -136,10 +123,7 @@ thingflags_udmf
 // When the UDMF field name is prefixed with ! it is inverted
 thingflagstranslation
 {
-	1 = "extra";
 	2 = "flip";
-	4 = "special";
-	8 = "ambush";
 }
 
 
@@ -459,20 +443,6 @@ doommaplumpnames
 		nodebuild = true;
 		allowempty = false;
 	}
-
-	REJECT
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-
-	BLOCKMAP
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = true;
-	}
 }
 
 udmfmaplumpnames
@@ -483,7 +453,12 @@ udmfmaplumpnames
 		nodebuild = true;
 		allowempty = false;
 	}
+}
 
+// Because Ring Racers has a versatile virtual resource
+// system, we can separate these out a bit more.
+sharedmaplumpnames
+{
 	REJECT
 	{
 		required = false;
@@ -497,6 +472,34 @@ udmfmaplumpnames
 		nodebuild = true;
 		allowempty = true;
 	}
+
+	PICTURE
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	MINIMAP
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	TWEAKMAP
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	ENCORE
+	{
+		required = false;
+		blindcopy = true;
+		nodebuild = false;
+	}
 }
 
 // ENUMERATIONS
@@ -672,7 +675,6 @@ enums
 //Default things filters
 thingsfilters
 {
-
 	filter0
 	{
 		name = "Player starts";
@@ -680,17 +682,7 @@ thingsfilters
 		type = -1;
 	}
 
-
 	filter1
-	{
-		name = "Enemies";
-		category = "enemies";
-		type = -1;
-
-	}
-
-
-	filter2
 	{
 		name = "Normal Gravity";
 		category = "";
@@ -703,8 +695,7 @@ thingsfilters
 
 	}
 
-
+	filter2
-	filter3
 	{
 		name = "Reverse Gravity";
 		category = "";
@@ -717,22 +708,17 @@ thingsfilters
 
 	}
 
-
+	filter3
-	filter4
 	{
 		name = "Rings";
 		category = "";
 		type = 300;
-
 	}
 
-
+	filter4
-	filter5
 	{
 		name = "Waypoints";
-		category = "";
+		category = "waypoints";
-		type = 2001;
-
 	}
 }
 

extras/conf/udb/Includes/RingRacers_sectors.cfg

@@ -0,0 +1,28 @@
+// Don't feel like updating, these are only for Doom format anyway...
+sectortypes
+{
+	0 = "Normal";
+}
+
+gen_sectortypes
+{
+	first
+	{
+		0 = "Normal";
+	}
+
+	second
+	{
+		0 = "Normal";
+	}
+
+	third
+	{
+		0 = "Normal";
+	}
+
+	fourth
+	{
+		0 = "Normal";
+	}
+}

extras/conf/udb/RingRacers_UDMF.cfg

@@ -1,34 +1,34 @@
 /************************************************************************\
-	Ultimate Doom Builder Game Configuration for SRB2Kart
+	Ultimate Doom Builder Game Configuration for Dr. Robotnik's Ring Racers
 \************************************************************************/
 
 // This is required to prevent accidental use of a different configuration
 type = "Doom Builder 2 Game Configuration";
 
 // This is the title to show for this game
-game = "SRB2Kart v2.0 (UDMF)";
+game = "Dr. Robotnik's Ring Racers (UDMF)";
 
 // This is the simplified game engine/sourceport name
 engine = "zdoom";
 
 // Settings common to all games and all map formats
-include("Includes\\Kart2_common.cfg", "common");
+include("Includes\\RingRacers_common.cfg", "common");
 
 // Settings common to text map format
-include("Includes\\Kart2_common.cfg", "mapformat_udmf");
+include("Includes\\RingRacers_common.cfg", "mapformat_udmf");
 
-include("Includes\\Game_Kart2.cfg");
+include("Includes\\Game_RingRacers.cfg");
 
 // Script lumps detection
 scriptlumpnames
 {
-	include("Includes\\Kart2_misc.cfg", "scriptlumpnames");
+	include("Includes\\RingRacers_misc.cfg", "scriptlumpnames");
 }
 
 //Default things filters
 thingsfilters
 {
-	include("Includes\\Kart2_misc.cfg", "thingsfilters");
+	include("Includes\\RingRacers_misc.cfg", "thingsfilters");
 }
 
 // ENUMERATIONS
@@ -37,5 +37,5 @@ thingsfilters
 enums
 {
 	// Basic game enums
-	include("Includes\\Kart2_misc.cfg", "enums");
+	include("Includes\\RingRacers_misc.cfg", "enums");
 }

src/p_setup.c

@@ -1260,8 +1260,8 @@ static boolean TextmapCount(size_t size)
 
 	// Check if namespace is valid.
 	tkn = M_TokenizerRead(0);
-	if (!fastcmp(tkn, "srb2"))
+	if (!fastcmp(tkn, "ringracers"))
-		CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'srb2' is supported.\n", tkn);
+		CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'ringracers' is supported.\n", tkn);
 
 	while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size)
 	{
@@ -2056,7 +2056,7 @@ static void P_WriteTextmap(void)
 		}
 	}
 
-	fprintf(f, "namespace = \"srb2\";\n");
+	fprintf(f, "namespace = \"ringracers\";\n");
 	for (i = 0; i < nummapthings; i++)
 	{
 		fprintf(f, "thing // %s\n", sizeu1(i));