From c7dcb5fa833354154ebf1775c2ab55aec56d2141 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sat, 14 Dec 2019 16:06:17 +0100
Subject: [PATCH] ZB config touchups. Fix mapthing flags and translations.
 Disable unused features. Moved some flags to special activations field. Fixed
 obsolete names in line flags.

---
 extras/conf/Includes/SRB222_common.cfg |  33 +++++---
 extras/conf/Includes/SRB222_misc.cfg   | 103 ++++++++++++++-----------
 extras/conf/Includes/SRB222_things.cfg |   7 +-
 3 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/extras/conf/Includes/SRB222_common.cfg b/extras/conf/Includes/SRB222_common.cfg
index 4982a6707..d4dbc6bde 100644
--- a/extras/conf/Includes/SRB222_common.cfg
+++ b/extras/conf/Includes/SRB222_common.cfg
@@ -234,10 +234,10 @@ mapformat_udmf
 	}
 	
 	// SECTOR RENSERSTYLES
-	sectorrenderstyles
+/*	sectorrenderstyles
 	{
-		include("UDMF_misc.cfg", "sectorrenderstyles");
-	}
+		include("SRB222_misc.cfg", "sectorrenderstyles");
+	}*/
 	
 	// LINEDEF FLAGS
 	linedefflags
@@ -248,6 +248,7 @@ mapformat_udmf
 	// LINEDEF ACTIVATIONS
 	linedefactivations
 	{
+		include("SRB222_misc.cfg", "linedefactivations_udmf");
 	}
 	
 	linedefflagstranslation
@@ -258,32 +259,40 @@ mapformat_udmf
 	// LINEDEF RENSERSTYLES
 	linedefrenderstyles
 	{
-		include("UDMF_misc.cfg", "linedefrenderstyles");
+		include("SRB222_misc.cfg", "linedefrenderstyles");
 	}
 
 	//SIDEDEF FLAGS
-	sidedefflags
+/*	sidedefflags
 	{
 		include("UDMF_misc.cfg", "sidedefflags");  
-	}
+	}*/
 
 	// THING FLAGS
 	thingflags
 	{
-		include("UDMF_misc.cfg", "thingflags");
+		include("SRB222_misc.cfg", "thingflags_udmf");
+	}
+	
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("SRB222_misc.cfg", "thingflagstranslation");
 	}
 	
 	// THING RENSERSTYLES
-	thingrenderstyles
+/*	thingrenderstyles
 	{
-		include("UDMF_misc.cfg", "thingrenderstyles");
-	}
+		include("SRB222_misc.cfg", "thingrenderstyles");
+	}*/
 
 	// How to compare thing flags (for the stuck things error checker)
-	thingflagscompare
+/*	thingflagscompare
 	{
 		include("UDMF_misc.cfg", "thingflagscompare");
-	}
+	}*/
 
 	//mxd. Thing flags UDMF translation table
 	// This is needed for copy/paste and prefabs to work properly
diff --git a/extras/conf/Includes/SRB222_misc.cfg b/extras/conf/Includes/SRB222_misc.cfg
index 4942a0879..9c5e31c71 100644
--- a/extras/conf/Includes/SRB222_misc.cfg
+++ b/extras/conf/Includes/SRB222_misc.cfg
@@ -42,9 +42,9 @@ linedefflagstranslation
 	256 = "midpeg";
 	512 = "midsolid";
 	1024 = "wrapmidtex";
-	2048 = "nosonic";
-	4096 = "notails";
-	8192 = "noknux";
+	2048 = "netonly";
+	4096 = "nonet";
+	8192 = "effect6";
 	16384 = "bouncy";
 	32768 = "transfer";
 }
@@ -52,29 +52,54 @@ linedefflagstranslation
 
 linedefflags_udmf
 {
-	blocking = "[0] Impassable";
-	blockmonsters = "[1] Block Enemies";
-	twosided = "[2] Double-Sided";
-	dontpegtop = "[3] Upper Unpegged";
-	dontpegbottom = "[4] Lower Unpegged";
-	skewtd = "[5] Slope Skew (E1)";
-	noclimb = "[6] Not Climbable";
-	noskew = "[7] No Midtexture Skew (E2)";
-	midpeg = "[8] Peg Midtexture (E3)";
-	midsolid = "[9] Solid Midtexture (E4)";
-	wrapmidtex = "[10] Repeat Midtexture (E5)";
-	nosonic = "[11] No Sonic";
-	notails = "[12] No Tails";
-	noknuckles = "[13] No Knuckles";
-	bouncy = "[14] Bouncy Wall";
-	transfer = "[15] Transfer Line";
-	fogwall = "[16] Fog Wall";
-	horizoneffect = "[17] Horizon Effect";
-	notriggerorder = "[18] Trigger Out of Order";
+	blocking = "Impassable";
+	blockmonsters = "Block Enemies";
+	twosided = "Double-Sided";
+	dontpegtop = "Upper Unpegged";
+	dontpegbottom = "Lower Unpegged";
+	skewtd = "Slope Skew";
+	noclimb = "Not Climbable";
+	noskew = "No Midtexture Skew";
+	midpeg = "Peg Midtexture";
+	midsolid = "Solid Midtexture";
+	wrapmidtex = "Repeat Midtexture";
+//	netonly = "Netgame-Only special";
+//	nonet = "No netgame special";
+//	effect6 = "Effect 6";
+	bouncy = "Bouncy Wall";
+	transfer = "Transfer Line";
 }
 
 
 linedefactivations_udmf
+{
+	notriggerorder = "Out of Order";
+	netonly = "Netgame-Only";
+	nonet = "No netgame";
+}
+
+sidedefflags
+{
+	clipmidtex = "Clip middle texture";
+	wrapmidtex = "Wrap middle texture";
+	smoothlighting = "Smooth lighting";
+	nofakecontrast = "Even lighting";
+	nodecals = "No decals";
+	lightfog = "Use sidedef brightness on fogged walls";
+}
+
+//RENDER STYLES
+thingrenderstyles
+{
+}
+
+linedefrenderstyles
+{
+	translucent = "Translucent";
+	fog = "Fog";
+}
+
+sectorrenderstyles
 {
 }
 
@@ -86,8 +111,13 @@ thingflags
 	8 = "[8] Ambush";
 }
 
+// THING FLAGS
 thingflags_udmf
 {
+	extra = "Extra";
+	flip = "Flip";
+	special = "Special";
+	ambush = "Ambush";
 }
 
 
@@ -96,9 +126,9 @@ thingflags_udmf
 // When the UDMF field name is prefixed with ! it is inverted
 thingflagstranslation
 {
-	1 = "skill1";
-	2 = "skill2";
-	4 = "skill3";
+	1 = "extra";
+	2 = "flip";
+	4 = "special";
 	8 = "ambush";
 }
 
@@ -382,21 +412,7 @@ doommaplumpnames
 }
 
 udmfmaplumpnames
-{
-	~MAP
-	{
-		required = true;
-		blindcopy = true;
-		nodebuild = false;
-	}
-	
-	TEXTMAP
-	{
-		required = true;
-		nodebuild = true;
-		allowempty = true;
-	}
-	
+{	
 	ZNODES
 	{
 		required = false;
@@ -417,13 +433,6 @@ udmfmaplumpnames
 		nodebuild = true;
 		allowempty = true;
 	}
-	
-	ENDMAP
-	{
-		required = true;
-		nodebuild = false;
-		allowempty = true;
-	}
 }
 
 // ENUMERATIONS
diff --git a/extras/conf/Includes/SRB222_things.cfg b/extras/conf/Includes/SRB222_things.cfg
index 78e79406e..bd0bc8be1 100644
--- a/extras/conf/Includes/SRB222_things.cfg
+++ b/extras/conf/Includes/SRB222_things.cfg
@@ -1371,9 +1371,12 @@ invisible
 {
 	color = 15; // White
 	title = "Misc. Invisible";
-	width = 8;
-	height = 16;
+	width = 0;
+	height = 0;
 	sprite = "UNKNA0";
+	sort = 1;
+	fixedsize = true;
+	blocking = 0;
 
 	700
 	{